forked from pool/systemd
.
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=491
This commit is contained in:
parent
42c873531d
commit
cb1a39fdf8
20
1017-skip-native-unit-handling-if-sysv-already-handled.patch
Normal file
20
1017-skip-native-unit-handling-if-sysv-already-handled.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
For bnc#818044
|
||||||
|
Based on http://cgit.freedesktop.org/systemd/systemd/patch/?id=67d6621059085963a2a908a3ea99ced3b0ca789e
|
||||||
|
---
|
||||||
|
systemctl.c | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
|
--- systemd-208/src/systemctl/systemctl.c
|
||||||
|
+++ systemd-208/src/systemctl/systemctl.c 2014-01-21 13:00:52.910736187 +0000
|
||||||
|
@@ -4453,6 +4453,11 @@ static int enable_unit(DBusConnection *b
|
||||||
|
if (r < 0)
|
||||||
|
return r;
|
||||||
|
|
||||||
|
+ /* If the operation was fully executed by the SysV compat,
|
||||||
|
+ * let's finish early */
|
||||||
|
+ if (strv_isempty(names))
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
if (!bus || avoid_bus()) {
|
||||||
|
if (streq(verb, "enable")) {
|
||||||
|
r = unit_file_enable(arg_scope, arg_runtime, arg_root, mangled_names, arg_force, &changes, &n_changes);
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jan 21 13:05:59 UTC 2014 - werner@suse.de
|
||||||
|
|
||||||
|
- Add patch 1017-skip-native-unit-handling-if-sysv-already-handled.patch
|
||||||
|
to avoid that enabled boot scripts will be handled as unit files
|
||||||
|
by systemctl status command (bnc#818044)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Jan 21 12:51:20 UTC 2014 - werner@suse.de
|
Tue Jan 21 12:51:20 UTC 2014 - werner@suse.de
|
||||||
|
|
||||||
|
@ -284,6 +284,8 @@ Patch1014: 1014-journald-with-journaling-FS.patch
|
|||||||
Patch1015: build-sys-make-multi-seat-x-optional.patch
|
Patch1015: build-sys-make-multi-seat-x-optional.patch
|
||||||
# PATCH-FIX-SUSE 1016-support-powerfail-with-powerstatus.patch
|
# PATCH-FIX-SUSE 1016-support-powerfail-with-powerstatus.patch
|
||||||
Patch1016: 1016-support-powerfail-with-powerstatus.patch
|
Patch1016: 1016-support-powerfail-with-powerstatus.patch
|
||||||
|
# PATCH-FIX-UPSTREAM 1017-skip-native-unit-handling-if-sysv-already-handled.patch
|
||||||
|
Patch1017: 1017-skip-native-unit-handling-if-sysv-already-handled.patch
|
||||||
# PATCH-FIX-SUSE 1018-Make-LSB-Skripts-know-about-Required-and-Should.patch
|
# PATCH-FIX-SUSE 1018-Make-LSB-Skripts-know-about-Required-and-Should.patch
|
||||||
Patch1018: 1018-Make-LSB-Skripts-know-about-Required-and-Should.patch
|
Patch1018: 1018-Make-LSB-Skripts-know-about-Required-and-Should.patch
|
||||||
# PATCH-FIX-SUSE 1019-make-completion-smart-to-be-able-to-redirect.patch
|
# PATCH-FIX-SUSE 1019-make-completion-smart-to-be-able-to-redirect.patch
|
||||||
@ -572,6 +574,7 @@ cp %{SOURCE7} m4/
|
|||||||
%patch1014 -p1
|
%patch1014 -p1
|
||||||
%patch1015 -p1
|
%patch1015 -p1
|
||||||
%patch1016 -p1
|
%patch1016 -p1
|
||||||
|
%patch1017 -p1
|
||||||
%patch1018 -p1
|
%patch1018 -p1
|
||||||
%patch1019 -p1
|
%patch1019 -p1
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user