Hello community, here is the log from the commit of package aaa_base checked in at Fri Aug 8 01:59:26 CEST 2008. -------- --- aaa_base/aaa_base.changes 2008-08-05 14:07:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2008-08-07 16:03:59.620491000 +0200 @@ -1,0 +2,12 @@ +Thu Aug 7 15:57:40 CEST 2008 - werner@suse.de + +- In halt script: use option -r of umount +- In boot.localfs: be sure that / is not busy by using the new -w + option of fuser for terminating all proccesses with write access + +------------------------------------------------------------------- +Thu Aug 7 15:25:08 CEST 2008 - schwab@suse.de + +- Fix shell function syntax. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.W19244/_old 2008-08-08 01:58:51.000000000 +0200 +++ /var/tmp/diff_new_pack.W19244/_new 2008-08-08 01:58:51.000000000 +0200 @@ -28,7 +28,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv udev net-tools AutoReqProv: on Version: 11.0.42 -Release: 23 +Release: 25 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -150,6 +150,12 @@ %defattr(-,root,root) %changelog +* Thu Aug 07 2008 werner@suse.de +- In halt script: use option -r of umount +- In boot.localfs: be sure that / is not busy by using the new -w + option of fuser for terminating all proccesses with write access +* Thu Aug 07 2008 schwab@suse.de +- Fix shell function syntax. * Tue Aug 05 2008 werner@suse.de - Start blogd after /dev/pts is mounted (bnc#410301) and related changes for better mainframe support in boot, rc, and halt. ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/cron.daily/suse.de-clean-tmp new/aaa_base/etc/cron.daily/suse.de-clean-tmp --- old/aaa_base/etc/cron.daily/suse.de-clean-tmp 2005-07-27 15:28:18.000000000 +0200 +++ new/aaa_base/etc/cron.daily/suse.de-clean-tmp 2005-07-27 15:28:18.000000000 +0200 @@ -35,7 +35,7 @@ OMIT="$OMIT ( ! -user $i )" done -function cleanup_tmp +cleanup_tmp () { MAX_DAYS=$1 shift 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 2008-08-05 13:42:14.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.localfs 2008-08-07 15:55:40.000000000 +0200 @@ -31,8 +31,8 @@ # # Special file systems (memory and network based) # -typeset -r tmpfs=tmpfs -typeset -r memfs=nfsd,devpts,proc,usbfs,sysfs,securityfs,debugfs,fusectl +typeset -r tmpfs=tmpfs,ramfs +typeset -r memfs=nfsd,devpts,proc,usbfs,sysfs,securityfs,debugfs,fusectl,rpc_pipefs typeset -r netfs=nfs,nfs4,smbfs,cifs typeset -r nofs=no${netfs//,/,no},no${memfs//,/,no} @@ -188,7 +188,7 @@ fi if test $FSCK_RETURN -gt 0; then sync - touch /fsck_corrected_errors + > /fsck_corrected_errors fi fi @@ -246,6 +246,7 @@ while read des fs type rest; do case "${des##*/}" in ""|\#*) continue ;; + swap) continue ;; rootfs) continue ;; loop*) umount $mtab $fs loopdel $des ;; @@ -273,9 +274,17 @@ esac done + # + # Use fuser with option -w if available to terminate all + # processes having write access to the root file system. + # + if fuser -skmw -TERM / > /dev/null 2>&1 ; then + sleep 1 + fi + UMOUNT_FAILED=false echo "Unmounting file systems" - umount -av $mtab -t no${tmpfs//,/,no},$nofs -O no_netdev || { + umount -arv $mtab -t no${tmpfs//,/,no},$nofs -O no_netdev || { rc_status UMOUNT_FAILED=true } @@ -288,18 +297,21 @@ # Use cat and a pipe because umount changes # /proc/mounts during direct read call cat $mounts | \ - while read des fs type rest; do + while read des fs type opts rest; do case "$des" in ""|\#*) continue ;; # Comment swap) continue ;; # No umount on swap devices esac + case ",$opts," in + *,ro,*) continue ;; # Already done + esac case ",$tmpfs,$memfs," in *,$type,*) continue ;; # Most of them are required esac case ",$netfs," in *,$type,*) continue ;; # Avoid hanging reboot/halt esac - mount -v -n -o remount,ro $fs + mount -nv -o remount,ro $fs done echo "extra sync..." @@ -322,4 +334,3 @@ esac rc_exit - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot.rootfsck new/aaa_base/etc/init.d/boot.rootfsck --- old/aaa_base/etc/init.d/boot.rootfsck 2008-08-05 13:42:45.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.rootfsck 2008-08-06 15:14:53.000000000 +0200 @@ -139,7 +139,7 @@ fi sync mount -n -o remount,rw / - test $FSCK_RETURN -gt 0 && touch /fsck_corrected_errors + test $FSCK_RETURN -gt 0 && > /fsck_corrected_errors else echo echo '*** ERROR! Cannot fsck because root is not read-only!' diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/profile.d/complete.bash new/aaa_base/etc/profile.d/complete.bash --- old/aaa_base/etc/profile.d/complete.bash 2008-06-09 14:21:12.000000000 +0200 +++ new/aaa_base/etc/profile.d/complete.bash 2008-06-09 14:21:12.000000000 +0200 @@ -23,7 +23,7 @@ complete -r _nullcommand &> /dev/null # Expanding shell function for directories -function _cd_ () +_cd_ () { local c=${COMP_WORDS[COMP_CWORD]} local s g=0 x diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/rc.splash new/aaa_base/etc/rc.splash --- old/aaa_base/etc/rc.splash 2006-08-24 14:44:01.000000000 +0200 +++ new/aaa_base/etc/rc.splash 2006-08-24 14:44:01.000000000 +0200 @@ -60,7 +60,7 @@ done unset i fi - function splashtrigger () + splashtrigger () { case "$1" in rlreached*) SPLASHSTART=$SPLASHEND @@ -70,7 +70,7 @@ *) /sbin/splash -p $SPLASHSTART -t "$1" "$SPLASHCFG" esac } - function splashprogress () + splashprogress () { local SPLASHDIFF test "$SPLASHNUM" -ge 1 || SPLASHNUM=1 @@ -79,7 +79,7 @@ SPLASHSTART=$((SPLASHSTART+SPLASHDIFF)) : $((SPLASHNUM--)) } - function splashparallel () + splashparallel () { local SPLASHDIFF local SPLASHOLDSTART=$SPLASHSTART @@ -92,7 +92,7 @@ SPLASHDIFF=$((SPLASHSTART-SPLASHOLDSTART)) echo "-S $SPLASHOLDSTART:$SPLASHDIFF" } - function splashmake () + splashmake () { local SPLASHDIFF=$((SPLASHEND-SPLASHSTART)) echo "-S $SPLASHSTART:$SPLASHDIFF" @@ -100,8 +100,8 @@ SPLASHNUM=0 } else - function splashtrigger () { :; } - function splashprogress () { :; } - function splashparallel () { echo ""; } - function splashmake () { echo ""; } + splashtrigger () { :; } + splashprogress () { :; } + splashparallel () { echo ""; } + splashmake () { echo ""; } fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/sbin/smart_agetty new/aaa_base/sbin/smart_agetty --- old/aaa_base/sbin/smart_agetty 2006-01-30 18:05:06.000000000 +0100 +++ new/aaa_base/sbin/smart_agetty 2006-01-30 18:05:06.000000000 +0100 @@ -3,7 +3,7 @@ #echo "$0: called with '$*'" > /dev/kmsg -function stop_me () { +stop_me () { kill -STOP $$ exit 1 } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/usr/bin/old new/aaa_base/usr/bin/old --- old/aaa_base/usr/bin/old 2003-09-01 13:11:41.000000000 +0200 +++ new/aaa_base/usr/bin/old 2003-09-01 13:11:41.000000000 +0200 @@ -11,7 +11,7 @@ # usage - tell user to use program # -function usage() { +usage() { echo usage: "$0" file\|dir [file\|dir ...] } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/usr/sbin/sysconf_addword new/aaa_base/usr/sbin/sysconf_addword --- old/aaa_base/usr/sbin/sysconf_addword 2008-06-02 18:07:11.000000000 +0200 +++ new/aaa_base/usr/sbin/sysconf_addword 2008-06-02 18:07:11.000000000 +0200 @@ -10,7 +10,7 @@ debug=false -function usage() { +usage() { cat <<-EOF usage: $(basename $0) [-r] FILE VAR WORD @@ -32,14 +32,14 @@ EOF } -function find_last_occurrence () { +find_last_occurrence () { # takes two arguments, FILE and VAR # and return the number of the last line where # VAR occurs in FILE (not commented) grep -n -- "^[[:space:]]*$1" $2 | tail -n 1 | cut -d: -f1 } -function word_present () { +word_present () { . $file case " ${!var} " in *" $word "*) true;; @@ -47,7 +47,7 @@ esac } -function add_word() { +add_word() { local word=$1 local word_quoted=$2 if ! word_present; then @@ -63,7 +63,7 @@ # some balancing for vim"s syntax highlighting } -function remove_word() { +remove_word() { local word=$1 local word_quoted=$2 if word_present; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org