forked from pool/systemd
0e78f272ba
add: 1008-udev-path_id-handle-Hyper-V-devices.patch
- keymap: Update the list of Samsung Series 9 models
add: 1009-keymap-Update-the-list-of-Samsung-Series-9-models.patch
- keymap: Add Samsung 700T
add: 1010-keymap-Add-Samsung-700T.patch
- libudev: avoid leak during realloc failure
add: 1011-libudev-avoid-leak-during-realloc-failure.patch
- libudev: do not resolve $attr{device} symlinks
add: 1012-libudev-do-not-resolve-attr-device-symlinks.patch
- libudev: validate 'udev' argument to udev_enumerate_new()
add: 1013-libudev-validate-udev-argument-to-udev_enumerate_new.patch
- udev: fix whitespace
add: 1014-udev-fix-whitespace.patch
- udev: properly handle symlink removal by 'change' event
add: 1015-udev-properly-handle-symlink-removal-by-change-event.patch
- udev: builtin - do not fail builtin initialization if one of
them returns an error
add: 1016-udev-builtin-do-not-fail-builtin-initialization-if-o.patch
- udev: use usec_t and now()
add: 1017-udev-use-usec_t-and-now.patch
closing an non-existent dbus connection and getting assertion
failures.
- udev: path_id - handle Hyper-V devices
add: 1008-udev-path_id-handle-Hyper-V-devices.patch
- keymap: Update the list of Samsung Series 9 models
add: 1009-keymap-Update-the-list-of-Samsung-Series-9-models.patch
- keymap: Add Samsung 700T
add: 1010-keymap-Add-Samsung-700T.patch
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=327
22 lines
1.0 KiB
Diff
22 lines
1.0 KiB
Diff
Index: systemd-195/src/systemctl/systemctl.c
|
|
===================================================================
|
|
--- systemd-195.orig/src/systemctl/systemctl.c
|
|
+++ systemd-195/src/systemctl/systemctl.c
|
|
@@ -4678,10 +4678,13 @@ static int parse_argv(int argc, char *ar
|
|
/* Hmm, so some other init system is
|
|
* running, we need to forward this
|
|
* request to it. For now we simply
|
|
- * guess that it is Upstart. */
|
|
-
|
|
- execv("/lib/upstart/telinit", argv);
|
|
+ * guess that it is Sysvinit or Upstart. */
|
|
|
|
+ if (!access("/lib/sysvinit/telinit", X_OK)) {
|
|
+ execv("/lib/sysvinit/telinit", argv);
|
|
+ } else {
|
|
+ execv("/lib/upstart/telinit", argv);
|
|
+ }
|
|
log_error("Couldn't find an alternative telinit implementation to spawn.");
|
|
return -EIO;
|
|
}
|