6dd417b710
- udev is GPL-2.0, the rest remains LGPL-2.1+ (bnc#787824) OBS-URL: https://build.opensuse.org/request/show/139993 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=111
42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
From f9d333f8d202fd853f2553ee6c3196b041ccfba5 Mon Sep 17 00:00:00 2001
|
|
From: Frederic Crozat <fcrozat@suse.com>
|
|
Date: Thu, 23 Aug 2012 11:08:25 +0200
|
|
Subject: [PATCH] fix support for boot prefixed initscript (bnc#746506)
|
|
|
|
---
|
|
src/systemctl.c | 20 ++++++++++++++++++++
|
|
1 file changed, 20 insertions(+)
|
|
|
|
Index: systemd-195/src/systemctl/systemctl.c
|
|
===================================================================
|
|
--- systemd-195.orig/src/systemctl/systemctl.c
|
|
+++ systemd-195/src/systemctl/systemctl.c
|
|
@@ -3453,7 +3453,27 @@ static int enable_sysv_units(char **args
|
|
|
|
if (!found_sysv) {
|
|
free(p);
|
|
+#if defined(TARGET_SUSE)
|
|
+ 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) {
|
|
+ log_error("No memory");
|
|
+ r = -ENOMEM;
|
|
+ goto finish;
|
|
+ }
|
|
+ p[strlen(p) - sizeof(".service") + 1] = 0;
|
|
+ found_sysv = access(p, F_OK) >= 0;
|
|
+
|
|
+ if (!found_sysv) {
|
|
+ free(p);
|
|
+ continue;
|
|
+ }
|
|
+#else
|
|
continue;
|
|
+#endif
|
|
}
|
|
|
|
/* Mark this entry, so that we don't try enabling it as native unit */
|