Hello community, here is the log from the commit of package sysvinit for openSUSE:Factory checked in at 2013-05-02 12:02:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysvinit (Old) and /work/SRC/openSUSE:Factory/.sysvinit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysvinit" Changes: -------- --- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes 2013-03-05 06:51:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2013-05-02 12:02:56.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 24 08:49:40 UTC 2013 - [email protected] + +- Add sanity check for /etc/inittab to avoid reload on systemd + systems (bnc#813510) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysvinit.spec ++++++ --- /var/tmp/diff_new_pack.TWZ27N/_old 2013-05-02 12:02:58.000000000 +0200 +++ /var/tmp/diff_new_pack.TWZ27N/_new 2013-05-02 12:02:58.000000000 +0200 @@ -32,6 +32,8 @@ BuildRequires: libselinux-devel BuildRequires: libsepol-devel BuildRequires: pam-devel +Requires(post): coreutils grep mkinitrd +Requires(postun): mkinitrd Url: http://savannah.nongnu.org/projects/sysvinit/ Source: sysvinit-%{SIVER}dsf.tar.bz2 Source2: killproc-%{KPVER}.tar.bz2 @@ -234,16 +236,22 @@ %stop_on_removal powerd %post +ret=0 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 + icount=$(grep -cE '^[[:alnum:]]+:[[:alnum:]]*:' /etc/inittab 2>/dev/null || echo 0) + if test $(stat -Lc '%%D-%%i' /) = $(stat -Lc '%%D-%%i' /proc/1/root) -a $icount -gt 6 ; then if test $(stat -Lc '%%D-%%i' /sbin/init) = $(stat -Lc '%%D-%%i' /sbin/sysvinit); then /sbin/telinit u fi + elif test $icount -le 6 ; then + echo 'Broken /etc/inittab found, installing and using %{name} make no sense!' 1>&2 + ret=1 fi fi if test -x /sbin/mkinitrd_setup; then mkinitrd_setup fi +exit $ret %postun tools %restart_on_update powerd -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
