forked from pool/systemd
a4023d0c37
- Fix patch tty-ask-password-agent-on-console.patch not to crash away but enable it to ask on all devices of /dev/console - Avoid "file not found /etc/udev/rules.d/70-persistent-net.rules" waring occurring in %post - Add patch let-vconsole-setup-get-properties-only-once-to-copy-them.patch to avoid broken virtual console mapping due stressed ioctl API for the virtual consoles (boo#904214) - Fix last change that is use the new name for udev packages in %pretrans. - restore usage of LUA in %pretrans. - Try to generate the systemd users and groups always in same order to avoid republish other packages (boo#944660) - cleanup specfile by removing commands that were dealing with systemd pre-generated files: we're now using systemd tarball generated directly from the git repo which doesn't contain any of these files. - there's no point in using LUA in %pretrans - Drop 0009-make-xsltproc-use-correct-ROFF-links.patch This patch was initialy added to workaround bsc#842844. But it appears that man(1) was fixed (included since 13.2 at least) to handle manual pages that consist only of a .so directive such as '.so <page>'. - Change use-rndaddentropy-ioctl-to-load-random-seed.patch to make it work on big endian OBS-URL: https://build.opensuse.org/request/show/333777 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=223
39 lines
1.5 KiB
Diff
39 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 | 18 +++++++++++++++++-
|
|
1 file changed, 17 insertions(+), 1 deletion(-)
|
|
|
|
Index: systemd-221/src/systemctl/systemctl.c
|
|
===================================================================
|
|
--- systemd-221.orig/src/systemctl/systemctl.c
|
|
+++ systemd-221/src/systemctl/systemctl.c
|
|
@@ -5165,8 +5165,24 @@ static int enable_sysv_units(const char
|
|
|
|
p[strlen(p) - strlen(".service")] = 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)
|
|
+ return -ENOMEM;
|
|
+ p[strlen(p) - sizeof(".service") + 1] = 0;
|
|
+ found_sysv = access(p, F_OK) >= 0;
|
|
+ if (!found_sysv)
|
|
+ continue;
|
|
+#else
|
|
continue;
|
|
+#endif
|
|
+ }
|
|
|
|
if (found_native)
|
|
log_info("Synchronizing state of %s with SysV init with %s...", name, argv[0]);
|