Hello community, here is the log from the commit of package aaa_base for openSUSE:11.4 checked in at Sun May 1 22:03:38 CEST 2011. -------- --- old-versions/11.4/UPDATES/all/aaa_base/aaa_base.changes 2011-03-15 15:32:07.000000000 +0100 +++ 11.4/aaa_base/aaa_base.changes 2011-04-21 12:49:33.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Apr 21 12:49:18 CEST 2011 - werner@suse.de + +- Start blogd only once at boot (related to bnc#642289) + +------------------------------------------------------------------- +Mon Mar 21 13:58:08 CET 2011 - werner@suse.de + +- Avoid waiting on bind mounts in boot.localfs +- Be aware in refresh_initrd that modules used in initrd may use + options in the /etc/modprobe.d/ files + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.mF8TTS/_old 2011-05-01 22:03:14.000000000 +0200 +++ /var/tmp/diff_new_pack.mF8TTS/_new 2011-05-01 22:03:14.000000000 +0200 @@ -21,7 +21,7 @@ Name: aaa_base Version: 11.4 -Release: 54.<RELEASE62> +Release: 54.<RELEASE64> License: GPLv2+ Group: System/Fhs Provides: bin bootutls etc skeleng skelger ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/init.d/boot new/aaa_base/etc/init.d/boot --- old/aaa_base/etc/init.d/boot 2011-01-15 13:28:44.000000000 +0100 +++ new/aaa_base/etc/init.d/boot 2011-04-21 12:48:02.000000000 +0200 @@ -29,6 +29,18 @@ export CONSOLE REDIRECT # +# Check real terminal line +# +if test -z "$REDIRECT" ; then + if (echo -n > /dev/tty) 2>/dev/null ; then + REDIRECT=/dev/tty + else + REDIRECT=/dev/console + fi + DO_BLOGD=no +fi + +# # Configuration and coloring of the boot messages # @@ -53,11 +65,11 @@ # Save old terminal settings and set -nl to avoid staircase # effect, do not lock scrolling, and avoid break characters. # -otty=$(stty -g) +otty=$(stty -g < $REDIRECT) if test "$FLOW_CONTROL" = "yes" ; then - stty -nl ixon ignbrk -brkint + stty -nl ixon ignbrk -brkint < $REDIRECT else - stty -nl -ixon ignbrk -brkint + stty -nl -ixon ignbrk -brkint < $REDIRECT fi echo -n "System Boot Control: " @@ -161,16 +173,8 @@ # Start blogd, requires /proc and /dev/pts. # Export the real device in variable REDIRECT. # -if test -z "$REDIRECT" ; then - if (echo -n > /dev/tty) 2>/dev/null ; then - REDIRECT=/dev/tty - else - REDIRECT=/dev/console - fi -else - if test "$DO_BLOGD" = yes ; then - /sbin/blogd $REDIRECT - fi +if test "$DO_BLOGD" = yes ; then + /sbin/blogd $REDIRECT fi # @@ -294,11 +298,6 @@ test -s /lib/bootcycle/stats && . /lib/bootcycle/stats # -# Stop blogd -# -killproc -QUIT /sbin/blogd - -# # Remember for master resource script # if test "$DO_CONFIRM" = "yes" ; then @@ -314,7 +313,7 @@ # # Restore old terminal settings # -stty $otty +stty $otty < $REDIRECT # # Let YaST2 finish its installation, if you installed with YaST2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/init.d/boot.localfs new/aaa_base/etc/init.d/boot.localfs --- old/aaa_base/etc/init.d/boot.localfs 2011-02-17 12:38:15.000000000 +0100 +++ new/aaa_base/etc/init.d/boot.localfs 2011-03-21 13:57:40.000000000 +0100 @@ -61,7 +61,7 @@ list_missed () { local dev line - local mount_opts="-t no${tmpfs//,/,no},$nofs -O no_netdev -O nonofail" + local mount_opts="-t no${tmpfs//,/,no},nonone -O no_netdev -O nonofail" mount -afnv $mount_opts 2> /dev/null | while read line ; do dev="${line%% *}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/init.d/rc new/aaa_base/etc/init.d/rc --- old/aaa_base/etc/init.d/rc 2010-05-28 16:38:17.000000000 +0200 +++ new/aaa_base/etc/init.d/rc 2011-04-21 12:48:02.000000000 +0200 @@ -115,6 +115,18 @@ export CONSOLE REDIRECT # +# Check real terminal line +# +if test -z "$REDIRECT" ; then + if (echo -n > /dev/tty) 2>/dev/null ; then + REDIRECT=/dev/tty + else + REDIRECT=/dev/console + fi + DO_BLOGD=no +fi + +# # Set I/O of this script and its childs to console # exec 0<> $CONSOLE 1>&0 2>&0 @@ -191,26 +203,18 @@ # Save old terminal settings and set -nl to avoid staircase # effect, do not lock scrolling, and avoid break characters. # -otty=$(stty -g) +otty=$(stty -g < $REDIRECT) if test "$FLOW_CONTROL" = "yes" ; then - stty -nl ixon ignbrk -brkint + stty -nl ixon ignbrk -brkint < $REDIRECT else - stty -nl -ixon ignbrk -brkint + stty -nl -ixon ignbrk -brkint < $REDIRECT fi # # Start blogd if not in single user mode # -if test -z "$REDIRECT" ; then - if (echo -n > /dev/tty) 2>/dev/null ; then - REDIRECT=/dev/tty - else - REDIRECT=/dev/console - fi -else - if test "$DO_BLOGD" = yes; then - /sbin/blogd $REDIRECT - fi +if test "$DO_BLOGD" = yes; then + /sbin/start_daemon /sbin/blogd $REDIRECT fi if test "$DO_CONFIRM" = "yes" ; then @@ -434,7 +438,7 @@ # # Restore old terminal settings # -stty $otty +stty $otty < $REDIRECT # # For the first logon on a virtual console. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/sbin/refresh_initrd new/aaa_base/sbin/refresh_initrd --- old/aaa_base/sbin/refresh_initrd 2009-10-07 13:28:24.000000000 +0200 +++ new/aaa_base/sbin/refresh_initrd 2011-03-21 13:56:44.000000000 +0100 @@ -6,12 +6,29 @@ # # Author: Werner Fink <werner@suse.de> # +initrd=$(readlink /boot/initrd) +test -n "$initrd" || exit 0 +modules=lib/modules/${initrd#initrd-} refresh=no -test /etc/sysconfig/clock -nt /boot/initrd && refresh=yes -test /etc/sysconfig/kernel -nt /boot/initrd && refresh=yes +test /etc/sysconfig/clock -nt $initrd && refresh=yes +test /etc/sysconfig/kernel -nt $initrd && refresh=yes + +while read module ; do + module=${module##*/} + module=${module%.ko} + modconfs=$(grep -lE "[[:blank:]]$module[[:blank:]]" /etc/modprobe.d/*) + for modconf in $modconfs; do + test $modconf -nt $initrd && refresh=yes + break 2 + done +done < <(lsinitrd /boot/initrd | grep -E "$modules/.*\.ko") +unset modules module modconfs modconf + test "$refresh" = yes || exit 0 +modprobe dm_mod --quiet &> /dev/null || true + line=on test -e /proc/splash && read line < /proc/splash line=${line##*: } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org