Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2012-06-25 14:38:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aaa_base", Maintainer is "ro@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2012-05-26 09:22:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2012-06-25 15:23:21.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Jun 25 09:03:20 CEST 2012 - vuntz@opensuse.org + +- Change /etc/bash.bashrc to work with recent versions of + bash-completion, that put files in /usr/share/bash-completion. + +------------------------------------------------------------------- +Fri Jun 22 14:17:46 UTC 2012 - werner@suse.de + +- Move boot.msg away if writable before initial start of blogd (bnc#763944) + +------------------------------------------------------------------- +Thu Jun 21 15:32:24 UTC 2012 - lnussel@suse.de + +- fix boot.localfs for new mount output (bnc#766035) +- use /run, preserve /run/no_blogd for shutdown + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/bash.bashrc new/aaa_base/files/etc/bash.bashrc --- old/aaa_base/files/etc/bash.bashrc 2012-05-25 15:25:26.000000000 +0200 +++ new/aaa_base/files/etc/bash.bashrc 2012-06-25 09:01:01.000000000 +0200 @@ -227,6 +227,8 @@ . $HOME/.bash_completion elif test -e /etc/bash_completion ; then . /etc/bash_completion + elif test -d /usr/share/bash-completion ; then + true # /etc/profile.d/bash_completion.sh will do the right thing elif test -s /etc/profile.d/complete.bash ; then . /etc/profile.d/complete.bash fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/init.d/boot new/aaa_base/files/etc/init.d/boot --- old/aaa_base/files/etc/init.d/boot 2012-05-25 15:25:26.000000000 +0200 +++ new/aaa_base/files/etc/init.d/boot 2012-06-22 16:15:22.000000000 +0200 @@ -185,6 +185,7 @@ # Export the real device in variable REDIRECT. # if test "$DO_BLOGD" = yes ; then + test -w /var/log/boot.msg && mv /var/log/boot.msg /var/log/boot.omsg /sbin/blogd $REDIRECT fi @@ -312,13 +313,13 @@ # Remember for master resource script # if test "$DO_CONFIRM" = "yes" ; then - > /var/run/do_confirm + > /run/do_confirm fi if test "$DO_FASTBOOT" = "yes" ; then - > /var/run/do_fastboot + > /run/do_fastboot fi if test "$DO_BLOGD" = "no" ; then - > /var/run/no_blogd + > /run/no_blogd fi # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/init.d/boot.localfs new/aaa_base/files/etc/init.d/boot.localfs --- old/aaa_base/files/etc/init.d/boot.localfs 2012-05-25 15:25:26.000000000 +0200 +++ new/aaa_base/files/etc/init.d/boot.localfs 2012-06-22 16:15:22.000000000 +0200 @@ -61,14 +61,13 @@ { local dev line local mount_opts="-t no${tmpfs//,/,no},$nofs,nonone -O no_netdev -O nonofail -O nobind" - - mount -afnv $mount_opts 2> /dev/null | while read line ; do + set -- mount -afnv $mount_opts + MOUNT_PRINT_SOURCE=1 "$@" 2> /dev/null | while read line ; do dev="${line%% *}" case "$line" in - mount:\ *) continue ;; # messages from mount - *mounted*) - continue ;; - *) test -e $dev && continue + *:\ ignored) continue ;; + *:\ already\ mounted) continue ;; + *) test "${dev#/}" = "$dev" -o -e $dev && continue echo "${dev}" ;; esac done @@ -103,18 +102,15 @@ memfs_nonudev () { - local none on mnt tag type opts - mount -afnv -t $mntfs -O no_netdev -O nonofail 2> /dev/null | \ - while read none on mnt tag type opts ; do - test "$mnt" = already && continue - case "$type" in - proc) [[ $mnt =~ /proc* ]] && continue ;; - sysfs) [[ $mnt =~ /sys* ]] && continue ;; - dev*) [[ $mnt =~ /dev* ]] && continue ;; - cgroup*) [[ $mnt =~ /sys* ]] && continue ;; - cpuset*) [[ $mnt =~ /sys* ]] && continue ;; + local dev line + set -- mount -afnv -t $mntfs -O no_netdev -O nonofail + "$@" 2> /dev/null | while read line ; do + dev="${line%% *}" + case "$line" in + *:\ ignored) continue ;; + *:\ already\ mounted) continue ;; esac - mount $mnt + mount $dev done } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/init.d/rc new/aaa_base/files/etc/init.d/rc --- old/aaa_base/files/etc/init.d/rc 2012-05-25 15:25:26.000000000 +0200 +++ new/aaa_base/files/etc/init.d/rc 2012-06-22 16:15:22.000000000 +0200 @@ -147,26 +147,25 @@ if rc_cmdline confirm > /dev/null ; then DO_CONFIRM=yes fi - test -e /var/run/do_confirm && DO_CONFIRM=yes - rm -f /var/run/do_confirm + test -e /run/do_confirm && DO_CONFIRM=yes + rm -f /run/do_confirm if rc_cmdline forcefsck > /dev/null ; then DO_FORCEFSCK=yes fi if rc_cmdline fastboot > /dev/null ; then DO_FASTBOOT=yes fi - test -e /var/run/do_fastboot && DO_FASTBOOT=yes - rm -f /var/run/do_fastboot + test -e /run/do_fastboot && DO_FASTBOOT=yes + rm -f /run/do_fastboot if rc_cmdline quiet > /dev/null ; then DO_QUIET=yes fi if test "$DO_FASTBOOT" = yes -o "$DO_QUIET" = yes -o ! -x /sbin/blogd ; then DO_BLOGD=no fi - test -e /var/run/no_blogd && DO_BLOGD=no - rm -f /var/run/no_blogd export DO_CONFIRM DO_FORCEFSCK DO_FASTBOOT DO_QUIET DO_BLOGD fi +test -e /run/no_blogd && DO_BLOGD=no # # Reset status of this script -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org