From d7011e83c73da856abc02ede5e1fb8500304a60c23bba3bf46414457bf409d8c Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 11 Oct 2011 11:07:20 +0000 Subject: [PATCH 1/4] - do not list specific sbin_init providers OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=208 --- systemd.changes | 5 +++++ systemd.spec | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/systemd.changes b/systemd.changes index 9891b612..e3a4709c 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 11 11:07:02 UTC 2011 - coolo@suse.com + +- do not list specific sbin_init providers + ------------------------------------------------------------------- Wed Oct 5 16:18:48 UTC 2011 - fcrozat@suse.com diff --git a/systemd.spec b/systemd.spec index 33a01022..794d39fa 100644 --- a/systemd.spec +++ b/systemd.spec @@ -99,8 +99,7 @@ Group: System/Base Summary: System V init tools Requires: %{name} = %{version} Provides: sbin_init -Conflicts: sysvinit -Conflicts: upstart +Conflicts: otherproviders(sbin_init) %description sysvinit Drop-in replacement of System V init tools. From 49b6146fdac87b8615db33cd1dc8d479d7ffd731a5dbbae341dcc039ca196ecf Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 11 Oct 2011 13:10:44 +0000 Subject: [PATCH 2/4] - under openSUSE if it's not systemd, chances are good it's sysvinit OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=209 --- systemd.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/systemd.changes b/systemd.changes index e3a4709c..97665142 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 11 13:10:27 UTC 2011 - coolo@suse.com + +- under openSUSE if it's not systemd, chances are good it's + sysvinit + ------------------------------------------------------------------- Tue Oct 11 11:07:02 UTC 2011 - coolo@suse.com From 3a3d573294e59156a75c5616e9ecf8a233af36a19543a66e7da04f6db40ff07d Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 11 Oct 2011 13:15:07 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=210 --- support-sysvinit.patch | 21 +++++++++++++++++++++ systemd.spec | 8 ++------ 2 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 support-sysvinit.patch diff --git a/support-sysvinit.patch b/support-sysvinit.patch new file mode 100644 index 00000000..627a3082 --- /dev/null +++ b/support-sysvinit.patch @@ -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; + } diff --git a/systemd.spec b/systemd.spec index 794d39fa..b66aa1b0 100644 --- a/systemd.spec +++ b/systemd.spec @@ -65,6 +65,7 @@ Patch6: 0001-handle-disable_caplock-and-compose_table-and-kbd_rat.patch Patch8: tty1.patch Patch10: 0001-service-Fix-dependencies-added-when-parsing-insserv..patch Patch13: 0001-service-flags-sysv-service-with-detected-pid-as-Rema.patch +Patch15: support-sysvinit.patch # Upstream First - Policy: # 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. %package devel -License: GPLv2+ Group: Development/Libraries/C and C++ Summary: Development headers for systemd Requires: %{name} = %{version} @@ -94,8 +94,6 @@ Requires: pkg-config Development headers and auxiliary files for developing applications for systemd. %package sysvinit -License: GPLv2+ -Group: System/Base Summary: System V init tools Requires: %{name} = %{version} Provides: sbin_init @@ -107,9 +105,6 @@ Drop-in replacement of System V init tools. %if %{build_plymouth} %package plymouth - -License: GPLv2+ -Group: System/Base Summary: Plymouth support for systemd Requires: %{name} = %{version} Requires: plymouth @@ -127,6 +122,7 @@ Plymouth integration for systemd %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 %build autoreconf -fiv From eaf75331b4401522ade21aad7d78cf285d1b3d5051f45b7d2f14a5448b4d2260 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 11 Oct 2011 13:58:26 +0000 Subject: [PATCH 4/4] - make sure updaters get in the /sbin/init from here - the sub package of the split package will decide which init wins in update case OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=211 --- systemd.changes | 6 ++++++ systemd.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/systemd.changes b/systemd.changes index 97665142..b45fab37 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 11 13:57:32 UTC 2011 - coolo@suse.com + +- make sure updaters get in the /sbin/init from here - the sub package + of the split package will decide which init wins in update case + ------------------------------------------------------------------- Tue Oct 11 13:10:27 UTC 2011 - coolo@suse.com diff --git a/systemd.spec b/systemd.spec index b66aa1b0..bec7ce20 100644 --- a/systemd.spec +++ b/systemd.spec @@ -98,6 +98,7 @@ Summary: System V init tools Requires: %{name} = %{version} Provides: sbin_init Conflicts: otherproviders(sbin_init) +Provides: sysvinit:/sbin/init %description sysvinit Drop-in replacement of System V init tools.