Hello community, here is the log from the commit of package aaa_base checked in at Fri Sep 12 22:38:23 CEST 2008. -------- --- aaa_base/aaa_base.changes 2008-09-02 09:30:47.000000000 +0200 +++ aaa_base/aaa_base.changes 2008-09-11 14:49:10.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Sep 11 14:48:29 CEST 2008 - mkoenig@suse.de + +- skip fsck if running on battery [fate#303375] + +------------------------------------------------------------------- +Thu Sep 11 11:40:11 CEST 2008 - ro@suse.de + +- modify_resolvconf is gone, call "netconfig update" instead + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.yrF423/_old 2008-09-12 22:37:21.000000000 +0200 +++ /var/tmp/diff_new_pack.yrF423/_new 2008-09-12 22:37:21.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: 38 +Release: 43 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -150,6 +150,10 @@ %defattr(-,root,root) %changelog +* Thu Sep 11 2008 mkoenig@suse.de +- skip fsck if running on battery [fate#303375] +* Thu Sep 11 2008 ro@suse.de +- modify_resolvconf is gone, call "netconfig update" instead * Tue Sep 02 2008 hare@suse.de - add 'hvc0' as valid console for s390x. * Tue Aug 19 2008 ro@suse.de ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot.cleanup new/aaa_base/etc/init.d/boot.cleanup --- old/aaa_base/etc/init.d/boot.cleanup 2008-08-11 16:50:41.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.cleanup 2008-09-11 11:40:03.000000000 +0200 @@ -58,11 +58,8 @@ test "$PREVLEVEL" = "S" && telinit q # Restore a possibly dynamically modified /etc/resolv.conf - if ls /etc/resolv.conf.saved.by.* &>/dev/null ; then - echo "Cleaning up using /sbin/modify_resolvconf:" - /sbin/modify_resolvconf cleanup - echo -e "$rc_done_up" - fi + /sbin/netconfig update + # delete temp files # If $CLEAR_TMP_DIRS_AT_BOOTUP = yes, delete files in # $TMP_DIRS_TO_CLEAR, if $CLEAR_TMP_DIRS_AT_BOOTUP starts with a "/" 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-11 16:38:48.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.localfs 2008-09-11 14:52:55.000000000 +0200 @@ -142,8 +142,13 @@ # # do fsck and start sulogin, if it fails. # + MAY_FSCK=1 + if test -x /usr/bin/on_ac_power ; then + # skip fsck if running on battery + /usr/bin/on_ac_power -q || MAY_FSCK=0 + fi FSCK_RETURN=0 - if test ! -f /fastboot -a -z "$DO_FASTBOOT" ; then + if test ! -f /fastboot -a -z "$DO_FASTBOOT" -a $MAY_FSCK -eq 1 ; then # common options for file system check FSCK_OPTS="-R -A -M -a -t noopts=nofail" # force file system check if forced 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-11 16:53:12.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.rootfsck 2008-09-11 14:52:42.000000000 +0200 @@ -71,6 +71,11 @@ # already checked and ok, skip the rest MAY_FSCK=0 fi + if test -x /usr/bin/on_ac_power ; then + # skip fsck if running on battery + /usr/bin/on_ac_power -q || MAY_FSCK=0 + fi + if test ! -f /fastboot -a -z "$DO_FASTBOOT" -a $MAY_FSCK -eq 1 ; then # If we use a serial console, don't use the fsck progress bar if test "$REDIRECT" = "/dev/tty1" ; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org