forked from pool/systemd
Frederic Crozat
813b4bf38e
+ systemd binary is now installed in /lib/systemd (symlink for /bin/systemd is available now) + kernel modules are now loaded through libkmod + Watchdog support is now useful (not complete) + new kernel command line available to set system wide environment variable: systemd.setenv + journald capabilities set is now limited + SIGPIPE is ignored by default. This can be disabled with IgnoreSIGPIPE=no in unit files. - Add fix-kmod-build.patch: fix build with libkmod - Drop remote-fs-after-network.patch (merged upstream) - Add dm-lvm-after-local-fs-pre-target.patch: ensure md / lvm /dmraid is started before mounting partitions, if fsck was disabled for them (bnc#733283). - Update lsb-header patch to correctly disable heuristic if X-Systemd-RemainAfterExit is specified (whatever its value) - Add fix-message-after-chkconfig.patch: don't complain if only sysv services are called in systemctl. - Add is-enabled-non-existing-service.patch: fix error message when running is-enabled on non-existing service. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=242
41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
From ab5919fa1af147c2632fdae7bed4504c898a60af Mon Sep 17 00:00:00 2001
|
|
From: Michal Schmidt <mschmidt@redhat.com>
|
|
Date: Thu, 9 Feb 2012 10:05:15 +0100
|
|
Subject: [PATCH] systemctl: check for no more work after chkconfig
|
|
|
|
Avoid a bogus message from 'systemctl enable ...' when all units given
|
|
are SysV services:
|
|
Warning: unit files do not carry install information. No operation
|
|
executed.
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=787407
|
|
---
|
|
src/systemctl.c | 7 +++++--
|
|
1 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/systemctl.c b/src/systemctl.c
|
|
index 12264f8..ab6d126 100644
|
|
--- a/src/systemctl.c
|
|
+++ b/src/systemctl.c
|
|
@@ -3662,12 +3662,15 @@ static int enable_unit(DBusConnection *bus, char **args) {
|
|
int r;
|
|
DBusError error;
|
|
|
|
- dbus_error_init(&error);
|
|
-
|
|
r = enable_sysv_units(args);
|
|
if (r < 0)
|
|
return r;
|
|
|
|
+ if (!args[1])
|
|
+ return 0;
|
|
+
|
|
+ dbus_error_init(&error);
|
|
+
|
|
if (!bus || avoid_bus()) {
|
|
if (streq(verb, "enable")) {
|
|
r = unit_file_enable(arg_scope, arg_runtime, arg_root, args+1, arg_force, &changes, &n_changes);
|
|
--
|
|
1.7.7
|
|
|