Hello community, here is the log from the commit of package aaa_base checked in at Fri Jun 22 10:29:52 CEST 2007. -------- --- aaa_base/aaa_base.changes 2007-06-20 15:49:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2007-06-22 10:20:53.048781000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 22 10:20:43 CEST 2007 - coolo@suse.de + +- remove 8 seconds worth of sleep() time from shutdown + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.gt8423/_old 2007-06-22 10:28:35.000000000 +0200 +++ /var/tmp/diff_new_pack.gt8423/_new 2007-06-22 10:28:35.000000000 +0200 @@ -19,7 +19,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv net-tools Autoreqprov: on Version: 10.3 -Release: 47 +Release: 48 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -134,6 +134,8 @@ %defattr(-,root,root) %changelog +* Fri Jun 22 2007 - coolo@suse.de +- remove 8 seconds worth of sleep() time from shutdown * Wed Jun 20 2007 - dmueller@suse.de - skeleton: change sendmail to generic smtp dependency - etc/init.d/*: add Short-Description tags ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/halt new/aaa_base/etc/init.d/halt --- old/aaa_base/etc/init.d/halt 2007-06-18 11:30:46.000000000 +0200 +++ new/aaa_base/etc/init.d/halt 2007-06-22 10:19:34.000000000 +0200 @@ -114,12 +114,43 @@ # Stop blogd before umounting /var test -x /sbin/blogd && killproc -QUIT /sbin/blogd +# give processes in front a chance to quit +fuser -sk -HUP /dev/tty1 /dev/tty2 /dev/tty3 /dev/tty4 /dev/tty5 /dev/tty6 + echo "Sending all processes the TERM signal..." killall5 -15 echo -e "$rc_done_up" -sleep 1 -test "$1" = "fast" -o -e /fastboot || sleep 4 +etime=$(date +%s) +etime=$(($etime+6)) +parent_processes=" $$ " +p=$$ +while test $p -ne 0; do + set $(< /proc/$p/stat) + parent_processes="$parent_processes$4 " + p=$4 +done +pushd /proc +while test $(date +%s) -lt $etime; do + left_processes= + echo -n "Left processes: " + + for dir in [0-9]*; do + case $parent_processes in + *" $dir "*) continue;; + esac + test -n "$(cat $dir/cmdline 2>/dev/null)" || continue + set $(< $dir/stat) + name=$2 + left_processes="$left_processes $name/$dir" + done + if test -z "$left_processes"; then + break + fi + echo "Waiting for: $left_processes" + usleep 500000 +done +popd echo "Sending all processes the KILL signal..." killall5 -9 @@ -164,14 +195,12 @@ # Make reboot noise and wait a few seconds to give harddisks the chance # to really flush their buffers before power goes down. if test -n "$REDIRECT" ; then - sleep 1 case "$HALT_SOUND" in "yes"|"quint") echo -en "\033[10;393]\a\033[10;262]" - sleep 1 ;; "octave") - for tone in 524 491 440 393 349 328 295 ; do + for tone in 524 491 440 393 349 328 295 262; do echo -en "\033[10;${tone}]\a" usleep 125000 done @@ -186,7 +215,6 @@ esac else test "$HALT_SOUND" = "no" || echo -en "\a" - sleep 2 fi echo $message test "$HALT_SOUND" = "no" || echo -en "\a" @@ -197,4 +225,4 @@ test -n "$REDIRECT" -a -n "$CONSOLE" && setconsole $REDIRECT < $CONSOLE # Now talk to kernel -exec $command -d -f $opts +exec $command -d -f -n $opts ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org