dirkmueller/systemd
SHA256
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=210

Browse Source
This commit is contained in:
Stephan Kulow 2011-10-11 13:15:07 +00:00 committed by Git OBS Bridge
parent 284887e8ea
commit b5f64c1365
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
support-sysvinit.patch Normal file
View File

@ -0,0 +1,21 @@
Index: systemd-36/src/systemctl.c
===================================================================
--- systemd-36.orig/src/systemctl.c
+++ systemd-36/src/systemctl.c
@@ -4672,10 +4672,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;
}

8
systemd.spec
View File

@ -65,6 +65,7 @@ Patch6: 0001-handle-disable_caplock-and-compose_table-and-kbd_rat.patch
Patch8: tty1.patch Patch8: tty1.patch
Patch10: 0001-service-Fix-dependencies-added-when-parsing-insserv..patch Patch10: 0001-service-Fix-dependencies-added-when-parsing-insserv..patch
Patch13: 0001-service-flags-sysv-service-with-detected-pid-as-Rema.patch Patch13: 0001-service-flags-sysv-service-with-detected-pid-as-Rema.patch
Patch15: support-sysvinit.patch
# Upstream First - Policy: # Upstream First - Policy:
# Never add any patches to this package without the upstream commit id # Never add any patches to this package without the upstream commit id
@ -84,7 +85,6 @@ transactional dependency-based service control logic. It can work as a
drop-in replacement for sysvinit. drop-in replacement for sysvinit.
%package devel %package devel
License: GPLv2+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Summary: Development headers for systemd Summary: Development headers for systemd
Requires: %{name} = %{version} Requires: %{name} = %{version}
@ -94,8 +94,6 @@ Requires: pkg-config
Development headers and auxiliary files for developing applications for systemd. Development headers and auxiliary files for developing applications for systemd.
%package sysvinit %package sysvinit
License: GPLv2+
Group: System/Base
Summary: System V init tools Summary: System V init tools
Requires: %{name} = %{version} Requires: %{name} = %{version}
Provides: sbin_init Provides: sbin_init
@ -107,9 +105,6 @@ Drop-in replacement of System V init tools.
%if %{build_plymouth} %if %{build_plymouth}
%package plymouth %package plymouth
License: GPLv2+
Group: System/Base
Summary: Plymouth support for systemd Summary: Plymouth support for systemd
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: plymouth Requires: plymouth
@ -127,6 +122,7 @@ Plymouth integration for systemd
%patch12 -p1 %patch12 -p1
%patch13 -p1 %patch13 -p1
%patch14 -p1 %patch14 -p1
%patch15 -p1
%build %build
autoreconf -fiv autoreconf -fiv