forked from pool/systemd
Frederic Crozat
6f4fdad1c2
- version 207, distribution specific changes follow, for overall
release notes see NEWS.
- Fixed:
* Failed at step PAM spawning /usr/lib/systemd/systemd:
Operation not permitted
* Fix shutdown hang "a stop job is running for Session 1 of user root"
that was reported in opensuse-factory list.
- systemd-sysctl no longer reads /etc/sysctl.conf however backward
compatbility is to be provides by a symlink created at %post.
- version 207, distribution specific changes follow, for overall
release notes see NEWS.
- Fixed:
* Failed at step PAM spawning /usr/lib/systemd/systemd:
Operation not permitted
* Fix shutdown hang "a stop job is running for Session 1 of user root"
that was reported in opensuse-factory list.
- systemd-sysctl no longer reads /etc/sysctl.conf however backward
compatbility is to be provides by a symlink created at %post.
OBS-URL: https://build.opensuse.org/request/show/198799
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=429
41 lines
1.5 KiB
Diff
41 lines
1.5 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(-)
|
|
|
|
--- systemd-206_git201308300826.orig/src/systemctl/systemctl.c
|
|
+++ systemd-206_git201308300826/src/systemctl/systemctl.c
|
|
@@ -4169,8 +4169,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*) "";
|