Hello community, here is the log from the commit of package sysvinit for openSUSE:Factory checked in at Tue Oct 11 18:00:01 CEST 2011.
-------- --- openSUSE:Factory/sysvinit/sysvinit.changes 2011-10-04 18:15:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/sysvinit/sysvinit.changes 2011-10-11 15:59:17.000000000 +0200 @@ -1,0 +2,18 @@ +Tue Oct 11 13:46:46 UTC 2011 - [email protected] + +- do not telinit u if /sbin/init is not sysvinit + +------------------------------------------------------------------- +Tue Oct 11 11:04:56 UTC 2011 - [email protected] + +- split out the symlink /sbin/init into a special subpackage, + which does _NOT_ do a split provide. systemd-sysvinit will + provide this, so you need to do extra work if you want to stay + on sysvinit + +------------------------------------------------------------------- +Tue Oct 11 10:16:45 UTC 2011 - [email protected] + +- remove unused files + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- killproc-2.20.tar.gz showconsole-1.15.dif showconsole-1.15.tar.bz2 showconsole-1.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysvinit.spec ++++++ --- /var/tmp/diff_new_pack.qq6AhW/_old 2011-10-11 17:59:58.000000000 +0200 +++ /var/tmp/diff_new_pack.qq6AhW/_new 2011-10-11 17:59:58.000000000 +0200 @@ -27,7 +27,6 @@ %define START 0.57 License: GPLv2+ Group: System/Base -AutoReqProv: on Version: %{SIVER} Release: 58 Summary: SysV-Style init @@ -59,7 +58,6 @@ Patch40: showconsole-%{SCVER}.dif Patch50: startpar-%{START}.dif Requires: sysvinit-tools -Provides: sbin_init %description System V style init programs by Miquel van Smoorenburg that control the @@ -72,9 +70,7 @@ more information. %package tools -License: GPLv2+ Summary: Tools for basic booting -Group: System/Base %if 0%{suse_version} > 1120 Requires(preun): coreutils %insserv_prereq Requires(postun): coreutils %insserv_prereq @@ -87,6 +83,15 @@ to startpar, killproc and pidof. System V init specific programs are in the sysvinit package. +%package init +Summary: Provides /sbin/init for sysvinit +Provides: sbin_init +Conflicts: otherproviders(sbin_init) +Requires: %{name} + +%description init +Just some symlinks + %prep %setup -n %{name}-%{SIVER}dsf -q -b 2 -b 3 -b 4 -b 5 %patch1 -p0 -b .startstop @@ -157,6 +162,11 @@ mkdir -m 755 -p ${RPM_BUILD_ROOT}%{_mandir}/man5 mkdir -m 755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8 make install -C src MANPATH=%{_mandir} ROOT=${RPM_BUILD_ROOT} WITH_SELINUX=yes DISTRO=SuSE + mv ${RPM_BUILD_ROOT}/sbin/init ${RPM_BUILD_ROOT}/sbin/sysvinit + ln -s /sbin/sysvinit ${RPM_BUILD_ROOT}/sbin/init + mkdir -p ${RPM_BUILD_ROOT}/lib/sysvinit + ln -sf /sbin/sysvinit ${RPM_BUILD_ROOT}/lib/sysvinit/telinit + ln -sf /sbin/sysvinit ${RPM_BUILD_ROOT}/sbin/telinit test -p ${RPM_BUILD_ROOT}/dev/initctl || { rm -f ${RPM_BUILD_ROOT}/dev/initctl mknod ${RPM_BUILD_ROOT}/dev/initctl p @@ -208,10 +218,12 @@ %stop_on_removal powered %post -if test -x /sbin/telinit -a -p /dev/initctl -a -f /proc/1/exe -a -d /proc/1/root -a ! -d /.build ; then - if test $(stat -Lc '%%D-%%i' /) = $(stat -Lc '%%D-%%i' /proc/1/root) ; then +if test -x /sbin/telinit -a -p /dev/initctl -a -f /proc/1/exe -a -d /proc/1/root -a ! -d /.build -a -x /sbin/init; then + if test $(stat -Lc '%%D-%%i' /) = $(stat -Lc '%%D-%%i' /proc/1/root); then + if test $(stat -Lc '%%D-%%i' /sbin/init) = $(stat -Lc '%%D-%%i' /sbin/sysvinit); then /sbin/telinit u fi + fi fi %post tools @@ -225,12 +237,14 @@ mkinitrd_setup fi -%clean -rm -rf ${RPM_BUILD_ROOT} - %files %defattr (-,root,root,755) -%config /etc/pam.d/init +/sbin/sysvinit +%dir /lib/sysvinit +/lib/sysvinit/telinit + +%files init +%defattr (-,root,root,755) /sbin/halt /sbin/init /sbin/poweroff @@ -257,6 +271,7 @@ %config /etc/init.d/powerd %doc doc/powerd %endif +%config /etc/pam.d/init %dir /lib/mkinitrd %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/boot-blogd.sh continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
