Hello community, here is the log from the commit of package aaa_base checked in at Mon Nov 19 17:52:55 CET 2007. -------- --- aaa_base/aaa_base.changes 2007-10-31 18:00:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2007-11-19 17:52:02.921794000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 9 10:55:16 CET 2007 - olh@suse.de + +- do not run swapoff -a during shutdown, only deactivate swapfiles + swap can not become unclean like filesystems (#342757) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.Ji3356/_old 2007-11-19 17:52:43.000000000 +0100 +++ /var/tmp/diff_new_pack.Ji3356/_new 2007-11-19 17:52:43.000000000 +0100 @@ -19,7 +19,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv net-tools AutoReqProv: on Version: 10.3.1 -Release: 13 +Release: 17 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -133,6 +133,9 @@ %files -f aaa_base.files %defattr(-,root,root) %changelog +* Fri Nov 09 2007 - olh@suse.de +- do not run swapoff -a during shutdown, only deactivate swapfiles + swap can not become unclean like filesystems (#342757) * Wed Oct 31 2007 - ro@suse.de - added psmisc as requires (fuser needed for /etc/init.d/reboot) (#334247) ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot.swap new/aaa_base/etc/init.d/boot.swap --- old/aaa_base/etc/init.d/boot.swap 2007-06-20 11:55:35.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.swap 2007-11-09 10:59:49.000000000 +0100 @@ -76,20 +76,17 @@ rc_status -v1 -r ;; stop) - echo "Turning off swap" - sync ; sync - rc_reset - swapoff -a &> /dev/null - rc_status -v1 -r - # Something forgotten? + echo "Turning off swap files" if test -r /proc/swaps ; then # Use cat and a pipe because swapoff changes # /proc/swaps during direct read call cat /proc/swaps | \ - while read des rest ; do - test "$des" = "Filename" && continue + while read des type rest ; do + # Release only swapfiles to allow a clean filesystem umount + test "$type" = "file" || continue swapoff $des &> /dev/null done + sync fi ;; restart) 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 2006-08-22 16:52:44.000000000 +0200 +++ new/aaa_base/etc/init.d/rc 2007-11-08 15:05:55.000000000 +0100 @@ -96,8 +96,8 @@ esac umount -n -r $fs done - cat /proc/swaps | while read des rest ; do - test "$des" = "Filename" && continue + cat /proc/swaps | while read des type rest ; do + test "$type" = "file" || continue swapoff $des &> /dev/null done umount -n -t proc /proc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/sbin/quick_halt new/aaa_base/sbin/quick_halt --- old/aaa_base/sbin/quick_halt 2002-02-13 10:26:50.000000000 +0100 +++ new/aaa_base/sbin/quick_halt 2007-11-08 13:32:35.000000000 +0100 @@ -84,9 +84,11 @@ # Now shut down filesystems ... properly umount -av -# The swapoff is only needed if we have swap files or swap on top -# of raid or LVM; otherwise you may comment it out. -swapoff -a; umount -av +cat /proc/swaps | while read des type rest ; do + test "$type" = "file" || continue + swapoff -v $des &> /dev/null +done +umount -av chvt $SYSLOGCONS & # Stop raid and LVM ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org