SHA256
1
0
forked from pool/systemd
systemd/fix-support-for-boot-prefixed-initscript-bnc-746506.patch

43 lines
1.6 KiB
Diff
Raw Normal View History

From: Frederic Crozat <fcrozat@suse.com>
Date: Thu, 23 Aug 2012 11:08:25 +0200
Subject: fix support for boot prefixed initscript (bnc#746506)
---
2013-04-19 22:31:17 +02:00
src/systemctl/systemctl.c | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
2013-04-19 22:31:17 +02:00
index c2b1749..84ce87c 100644
--- 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;
2013-04-19 22:31:17 +02:00
- if (!found_sysv)
+ if (!found_sysv) {
+#ifdef HAVE_SYSV_COMPAT
2013-04-19 22:31:17 +02:00
+ 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) {
2013-04-19 22:31:17 +02:00
+ 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
2013-04-19 22:31:17 +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*) "";