2012-08-25 23:03:07 +02:00
|
|
|
From: Frederic Crozat <fcrozat@suse.com>
|
|
|
|
Date: Thu, 23 Aug 2012 11:08:25 +0200
|
2013-04-13 13:09:53 +02:00
|
|
|
Subject: fix support for boot prefixed initscript (bnc#746506)
|
2012-08-25 23:03:07 +02:00
|
|
|
|
|
|
|
---
|
2013-04-19 22:31:17 +02:00
|
|
|
src/systemctl/systemctl.c | 22 +++++++++++++++++++++-
|
|
|
|
1 file changed, 21 insertions(+), 1 deletion(-)
|
2012-08-25 23:03:07 +02:00
|
|
|
|
2013-04-13 13:09:53 +02:00
|
|
|
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
|
2013-04-19 22:31:17 +02:00
|
|
|
index c2b1749..84ce87c 100644
|
2013-04-13 13:09:53 +02:00
|
|
|
--- a/src/systemctl/systemctl.c
|
|
|
|
+++ b/src/systemctl/systemctl.c
|
2013-04-19 22:31:17 +02:00
|
|
|
@@ -4060,8 +4060,28 @@ static int enable_sysv_units(char **args) {
|
|
|
|
p[strlen(p) - sizeof(".service") + 1] = 0;
|
|
|
|
found_sysv = access(p, F_OK) >= 0;
|
2012-08-25 23:03:07 +02:00
|
|
|
|
2013-04-19 22:31:17 +02:00
|
|
|
- if (!found_sysv)
|
|
|
|
+ if (!found_sysv) {
|
2013-04-13 13:09:53 +02:00
|
|
|
+#ifdef HAVE_SYSV_COMPAT
|
2013-04-19 22:31:17 +02:00
|
|
|
+ free(p);
|
2012-08-25 23:03:07 +02:00
|
|
|
+ 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) {
|
2013-04-19 22:31:17 +02:00
|
|
|
+ r = log_oom();
|
2012-08-25 23:03:07 +02:00
|
|
|
+ goto finish;
|
|
|
|
+ }
|
|
|
|
+ p[strlen(p) - sizeof(".service") + 1] = 0;
|
|
|
|
+ found_sysv = access(p, F_OK) >= 0;
|
|
|
|
+
|
|
|
|
+ if (!found_sysv) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+#else
|
|
|
|
continue;
|
|
|
|
+#endif
|
2013-04-19 22:31:17 +02:00
|
|
|
+ }
|
2012-08-25 23:03:07 +02:00
|
|
|
|
|
|
|
/* Mark this entry, so that we don't try enabling it as native unit */
|
2013-04-19 22:31:17 +02:00
|
|
|
args[f] = (char*) "";
|