diff --git a/mkinitrd-boot.sh b/mkinitrd-boot.sh index 5ec57aa..1310a20 100644 --- a/mkinitrd-boot.sh +++ b/mkinitrd-boot.sh @@ -13,7 +13,10 @@ ## ----------------------- ## -if test -z "$REDIRECT" ; then +fboot=$(get_param fastboot) +quiet=$(get_param quiet) + +if test -z "$fboot" -a -z "$quiet" -a -z "$REDIRECT" ; then REDIRECT=$(showconsole 2>/dev/null) if test -n "$REDIRECT" ; then if test "$devpts" != "yes" ; then diff --git a/mkinitrd-kill2.sh b/mkinitrd-kill2.sh index 73a35b6..6e5229a 100644 --- a/mkinitrd-kill2.sh +++ b/mkinitrd-kill2.sh @@ -17,10 +17,16 @@ if test -n "$blogd_pid" ; then kill -QUIT "$blogd_pid" - while [ -d "/proc/$blogd_pid" ]; do + typeset -i bquit=50 + while test -d "/proc/$blogd_pid" ; do usleep 30000 + if ((bquit-- <= 0)) ; then + kill -KILL "$blogd_pid" + break + fi done - if [ "$devpts" = "yes" ] ; then + unset bquit blogd_pid + if test "$devpts" = "yes" ; then umount -t devpts /dev/pts fi fi diff --git a/sysvinit.changes b/sysvinit.changes index 29849da..ff2336e 100644 --- a/sysvinit.changes +++ b/sysvinit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 28 12:49:42 CEST 2009 - werner@suse.de + +- Disable blogd on fastboot or quiet boot + ------------------------------------------------------------------- Tue Apr 21 18:40:42 CEST 2009 - werner@suse.de diff --git a/sysvinit.spec b/sysvinit.spec index bda8c7b..13ac15f 100644 --- a/sysvinit.spec +++ b/sysvinit.spec @@ -30,7 +30,7 @@ Group: System/Base PreReq: coreutils AutoReqProv: on Version: 2.86 -Release: 204 +Release: 205 Summary: SysV-Style init BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libselinux-devel libsepol-devel @@ -327,6 +327,8 @@ rm -rf ${RPM_BUILD_ROOT} %doc %{_mandir}/man8/mkill.8.gz %changelog +* Tue Apr 28 2009 werner@suse.de +- Disable blogd on fastboot or quiet boot * Tue Apr 21 2009 werner@suse.de - Make initrd script for blogd depend on initrd script clock * Fri Mar 27 2009 werner@suse.de