- fix ummounting

-- locale & /usr problem
-- devfs ready

svn-id: @641

diff --git a/rc.d/rc.shutdown b/rc.d/rc.shutdown
index 945436f8500bb97897dbf2d2125d2d1c7ed28e8f..a6c37d239130b46f4d1a18043d452a6ad2eecb1f 100755 (executable)
--- a/rc.d/rc.shutdown
+++ b/rc.d/rc.shutdown
@@ -6,7 +6,7 @@
 #               Modified for PLD Linux by Grzegorz Stanislawski
 # Changes:      Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
 #
-# $Id: rc.shutdown,v 1.2 2000/02/03 11:48:30 misiek Exp $
+# $Id: rc.shutdown,v 1.3 2000/02/18 10:37:06 wiget Exp $
 
 # Set the path.
 PATH=/sbin:/bin:/usr/bin:/usr/sbin
@@ -36,11 +36,20 @@ run_cmd "Turning off swap and accounting" swapoff -a
 # Unmount file systems, killing processes if we have to.
 sig=
 retry=3
-remaining=`awk '!/(^#|proc|^none|^\/dev\/root)/ {print $2}' /proc/mounts`
+remaining=`awk '!/(^#| (proc|devfs|devpts|\/) |^none|^\/dev\/root)/ {print $2}' /proc/mounts`
 while [ -n "$remaining" -a "$retry" -gt 0 ]
 do
-        run_cmd "Unmounting file systems"  umount -a -f -t noproc
-        sleep 2
+       _ERRORS=""
+       show "Unmounting file systems"; busy
+       if _ERRORS="`LANG_OLD=$LANG;LANG=C;initlog -c \"umount -a -f -t noproc\" 2>&1;LANG=$LANG_OLD`"; the
+       n
+               deltext; ok
+       else
+               deltext; fail; echo $_ERRORS
+       fi
+       unset _ERRORS
+        
+       sleep 2
         remaining=`awk '!/(^#|proc|^none|^\/dev\/root)/ {print $2}' /proc/mounts`
         [ -z "$remaining" ] && break
         [ -x /sbin/fuser ] && /sbin/fuser -k -m $sig $remaining >/dev/null