forked from pool/systemd
5392bf0c44
- Cleanup NumLock setting code (handle-numlock-value-in-etc-sysconfig-keyboard.patch). (forwarded request 178889 from sbrabec) OBS-URL: https://build.opensuse.org/request/show/178890 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=143
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From: Frederic Crozat <fcrozat@suse.com>
|
|
Date: Thu, 23 Aug 2012 11:08:25 +0200
|
|
Subject: fix support for boot prefixed initscript (bnc#746506)
|
|
|
|
---
|
|
src/systemctl/systemctl.c | 22 +++++++++++++++++++++-
|
|
1 file changed, 21 insertions(+), 1 deletion(-)
|
|
|
|
Index: systemd-204/src/systemctl/systemctl.c
|
|
===================================================================
|
|
--- systemd-204.orig/src/systemctl/systemctl.c
|
|
+++ systemd-204/src/systemctl/systemctl.c
|
|
@@ -4082,8 +4082,28 @@ static int enable_sysv_units(char **args
|
|
p[strlen(p) - sizeof(".service") + 1] = 0;
|
|
found_sysv = access(p, F_OK) >= 0;
|
|
|
|
- if (!found_sysv)
|
|
+ if (!found_sysv) {
|
|
+#ifdef HAVE_SYSV_COMPAT
|
|
+ free(p);
|
|
+ p = NULL;
|
|
+ if (!isempty(arg_root))
|
|
+ asprintf(&p, "%s/" SYSTEM_SYSVINIT_PATH "/boot.%s", arg_root, name);
|
|
+ else
|
|
+ asprintf(&p, SYSTEM_SYSVINIT_PATH "/boot.%s", name);
|
|
+ if (!p) {
|
|
+ r = log_oom();
|
|
+ goto finish;
|
|
+ }
|
|
+ p[strlen(p) - sizeof(".service") + 1] = 0;
|
|
+ found_sysv = access(p, F_OK) >= 0;
|
|
+
|
|
+ if (!found_sysv) {
|
|
+ continue;
|
|
+ }
|
|
+#else
|
|
continue;
|
|
+#endif
|
|
+ }
|
|
|
|
/* Mark this entry, so that we don't try enabling it as native unit */
|
|
args[f] = (char*) "";
|