commit aaa_base for openSUSE:Factory
Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Fri Feb 6 16:02:54 CET 2009. -------- --- aaa_base/aaa_base.changes 2009-01-26 11:25:49.000000000 +0100 +++ aaa_base/aaa_base.changes 2009-02-06 14:25:21.732200898 +0100 @@ -1,0 +2,10 @@ +Fri Feb 6 14:24:36 CET 2009 - werner@suse.de + +- Enhance single user mode for shutdown (bnc#473043) + +------------------------------------------------------------------- +Wed Feb 4 17:39:52 CET 2009 - ro@suse.de + +- drop broken 0size file in man8 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.R25909/_old 2009-02-06 15:53:11.000000000 +0100 +++ /var/tmp/diff_new_pack.R25909/_new 2009-02-06 15:53:11.000000000 +0100 @@ -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.2 -Release: 7 +Release: 8 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -139,6 +139,10 @@ %defattr(-,root,root) %changelog +* Fri Feb 06 2009 werner@suse.de +- Enhance single user mode for shutdown (bnc#473043) +* Wed Feb 04 2009 ro@suse.de +- drop broken 0size file in man8 * Mon Jan 26 2009 coolo@suse.de - removing the timeout, there is no good timeout value (bnc#426270) * Fri Jan 23 2009 coolo@suse.de ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/halt new/aaa_base/etc/init.d/halt --- old/aaa_base/etc/init.d/halt 2008-12-05 12:25:45.000000000 +0100 +++ new/aaa_base/etc/init.d/halt 2009-02-06 14:21:05.000000000 +0100 @@ -115,27 +115,26 @@ type -p startpar &> /dev/null || RUN_PARALLEL="no" startpar -v &> /dev/null || RUN_PARALLEL="no" -# -# set back system boot configuration -# -if test "$RUN_PARALLEL" = "yes" ; then - - startopt="-p4 -t 30 -T 3" - eval $(startpar $startopt -M halt) - unset failed_service skipped_service - -elif test -d /etc/init.d/boot.d/ ; then - +if test -z "$COLD_BOOT" ; then # - # call modules in boot.d via K* symlinks + # set back system boot configuration # + if test "$RUN_PARALLEL" = "yes" ; then - for link in /etc/init.d/boot.d/K[0-9][0-9]*; do - test -x $link || continue - $link stop - done - unset link - + startopt="-p4 -t 30 -T 3" + eval $(startpar $startopt -M halt) + unset failed_service skipped_service + + elif test -d /etc/init.d/boot.d/ ; then + # + # call modules in boot.d via K* symlinks + # + for link in /etc/init.d/boot.d/K[0-9][0-9]*; do + test -x $link || continue + $link stop + done + unset link + fi fi # check out if a software raid is active 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 2008-10-15 12:47:52.000000000 +0200 +++ new/aaa_base/etc/init.d/rc 2009-02-06 14:18:07.000000000 +0100 @@ -54,36 +54,56 @@ # Up from runlevel S we have to check if the system was # cold booted into single user mode and call /etc/init.d/boot. # -if test "$PREVLEVEL" = "S" -a "$RUNLEVEL" != "0" -a "$RUNLEVEL" != "6" ; then - # Double check - single="no" - hvname="yes" +if test "$PREVLEVEL" = "S" -a -n "$INIT_VERSION" ; then # - if rc_cmdline single s S ; then - single="yes" + # Check if this is a cold boot + # + COLD_BOOT=no + DTYPE=$(stat -f -c "%T" /proc 2>/dev/null) + if test "$DTYPE" != "proc" ; then + mount -n -t proc proc /proc + COLD_BOOT=yes + fi + DTYPE=$(stat -f -c "%T" /sys 2>/dev/null) + if test "$DTYPE" != "sysfs" ; then + mount -n -t sysfs sysfs /sys + COLD_BOOT=yes + fi + DTYPE=$(stat -f -c "%T" /dev/pts 2>/dev/null) + if test "$DTYPE" != "devpts" ; then + mount -n -t devpts -o mode=0620,gid=5 devpts /dev/pts + COLD_BOOT=yes fi read -t 2 hostname < /proc/sys/kernel/hostname 2> /dev/null case "${hostname}" in - "(none)"|unknown|"") hvname="no" ;; + "(none)"|unknown|"") COLD_BOOT=yes ;; esac unset hostname + export COLD_BOOT - if test "$single" = "yes" -a "$hvname" = "no" ; then - # This is the case if we're up from cold boot - echo "Sending all processes the TERM signal..." - killall5 -15 - sleep 3 - echo "Sending all processes the KILL signal..." - killall5 -9 - /etc/init.d/boot.swap stop nomtab - /etc/init.d/boot.localfs stop nomtab - /etc/init.d/boot - else - for b in /etc/init.d/boot.d/S*boot.udev - do - test -x $b || continue - $b start - done + # + # Changing from single user mode into runlevel mode + # For cold boot run all run boot otherwise start udev + # + if "$RUNLEVEL" != "0" -a "$RUNLEVEL" != "6" ; then + if test "$COLD_BOOT" = "yes" ; then + # This is the case if we're up from cold boot + echo "Sending all processes the TERM signal..." + killall5 -15 + sleep 3 + echo "Sending all processes the KILL signal..." + killall5 -9 + /etc/init.d/boot.swap stop nomtab + /etc/init.d/boot.localfs stop nomtab + /etc/init.d/boot + else + for b in /etc/init.d/boot.d/S*boot.udev + do + test -x $b || continue + $b start + done + fi + unset COLD_BOOT fi fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de