Hello community,
here is the log from the commit of package systemd for openSUSE:Factory
checked in at Tue Oct 11 17:59:47 CEST 2011.
--------
--- openSUSE:Factory/systemd/systemd.changes 2011-10-08 11:44:38.000000000
+0200
+++ /mounts/work_src_done/STABLE/systemd/systemd.changes 2011-10-11
15:58:26.000000000 +0200
@@ -1,0 +2,17 @@
+Tue Oct 11 13:57:32 UTC 2011 - co...@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 - co...@suse.com
+
+- under openSUSE if it's not systemd, chances are good it's
+ sysvinit
+
+-------------------------------------------------------------------
+Tue Oct 11 11:07:02 UTC 2011 - co...@suse.com
+
+- do not list specific sbin_init providers
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
support-sysvinit.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ systemd.spec ++++++
--- /var/tmp/diff_new_pack.uacwIn/_old 2011-10-11 17:59:41.000000000 +0200
+++ /var/tmp/diff_new_pack.uacwIn/_new 2011-10-11 17:59:41.000000000 +0200
@@ -65,6 +65,7 @@
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 @@
drop-in replacement for sysvinit.
%package devel
-License: GPLv2+
Group: Development/Libraries/C and C++
Summary: Development headers for systemd
Requires: %{name} = %{version}
@@ -94,13 +94,11 @@
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
-Conflicts: sysvinit
-Conflicts: upstart
+Conflicts: otherproviders(sbin_init)
+Provides: sysvinit:/sbin/init
%description sysvinit
Drop-in replacement of System V init tools.
@@ -108,9 +106,6 @@
%if %{build_plymouth}
%package plymouth
-
-License: GPLv2+
-Group: System/Base
Summary: Plymouth support for systemd
Requires: %{name} = %{version}
Requires: plymouth
@@ -128,6 +123,7 @@
%patch12 -p1
%patch13 -p1
%patch14 -p1
+%patch15 -p1
%build
autoreconf -fiv
++++++ support-sysvinit.patch ++++++
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;
}
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
