- added support for selecting macvlan mode

[projects/rc-scripts.git] / rc.d / rc.shutdown

diff --git a/rc.d/rc.shutdown b/rc.d/rc.shutdown
index 9afed4bcad0a3d66e52641e184259882f9b01d72..d86f962e8d6d94039069a8404a06656c26d1eb90 100755 (executable)
--- a/rc.d/rc.shutdown
+++ b/rc.d/rc.shutdown
@@ -4,7 +4,6 @@
 #
 # Author:      Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org>
 #
-# $Id$
 
 # Set the path.
 PATH=/sbin:/bin:/usr/bin:/usr/sbin
@@ -33,16 +32,21 @@ if [ -x /sbin/blogd ]; then
        killall -q -QUIT blogd
 fi
 
+if [ -e /dev/rtc -o -e /dev/rtc0 ]; then
+       run_cmd "$(nls 'Syncing hardware clock to system time')" hwclock --systohc
+fi
+
 # check for other processes.
 # there could be none if all services were terminated properly
 # pgrep -g 0 requires procps >= 3.2.6-1.1
+# XXX: pgrep is on /usr!
 pids=$(pgrep -g 0 -l -v | grep -v '^1 ')
-if [ -n "$pids" ]; then
+if [ -n "$pids" ] || [ ! -x /usr/bin/pgrep ]; then
        run_cmd "Sending all processes the TERM signal" killall5 -15
 fi
 
 pids=$(pgrep -g 0 -l -v | grep -v '^1 ')
-if [ -n "$pids" ]; then
+if [ -n "$pids" ] || [ ! -x /usr/bin/pgrep ]; then
        sleep 5
        run_cmd "Sending all processes the KILL signal" killall5 -9
 fi
@@ -73,7 +77,7 @@ if ! is_yes "$VSERVER"; then
                UMOUNT_IGNORE="/ $UMOUNT_IGNORE"
        fi
        remaining=$(awk -v ig="^($UMOUNT_IGNORE)$" 'BEGIN { gsub(/[\t ]+/, "|", ig); } \
-                       $3 !~ /^(proc|loopfs|devpts|shm|iso9660|ramfs|tmpfs|sysfs|securityfs|squashfs)$/ \
+                       $3 !~ /^(proc|loopfs|devpts|devtmpfs|shm|iso9660|ramfs|tmpfs|sysfs|securityfs|squashfs)$/ \
                        && $1 !~ /^(none|\/dev\/root)$/ \
                        && $2 !~ ig {print $2}' /proc/mounts)
        while [ -n "$remaining" -a "$retry" -gt 0 ]; do
@@ -97,7 +101,7 @@ if ! is_yes "$VSERVER"; then
 
                sleep 2
                remaining=$(awk -v ig="^($UMOUNT_IGNORE)$" 'BEGIN { gsub(/[\t ]+/, "|", ig); } \
-                               $3 !~ /^(proc|loopfs|devpts|shm|iso9660|ramfs|tmpfs|sysfs|securityfs|squashfs)$/ \
+                               $3 !~ /^(proc|loopfs|devpts|devtmpfs|shm|iso9660|ramfs|tmpfs|sysfs|securityfs|squashfs)$/ \
                                && $1 !~ /^(none|\/dev\/root)$/ \
                                && $2 !~ ig {print $2}' /proc/mounts)
                [ -z "$remaining" ] && break
@@ -113,36 +117,18 @@ if ! is_yes "$VSERVER"; then
        if [ -x /sbin/vgchange ]; then
                lvmversion=$(LC_ALL=C /sbin/vgchange --version 2>/dev/null | awk '/LVM version:/{if ($3 >= 2) print "2"}')
                if [ "$lvmversion" = "2" ]; then
-                       lvmignorelock="--ignorelockingfailure"
+                       lvmsysinit="--sysinit"
                else
-                       lvmignorelock=""
+                       lvmsysinit=""
                fi
-               run_cmd "Stopping LVM volume groups" /sbin/vgchange -a n $lvmignorelock
+               /sbin/vgchange -a n $lvmsysinit > /dev/null 2>&1
        fi
 
-       goraidtab=1
        if [ -x /sbin/mdadm -a -f /etc/mdadm.conf ]; then
                if grep -qE "^([[:blank:]]|)ARRAY[[:blank:]]" /etc/mdadm.conf 2>/dev/null; then
                        /sbin/mdadm --stop --scan > /dev/null 2>&1
                        rc=$?
-                       [ "$rc" -eq 0 ] && goraidtab=0
-               fi
-       fi
-
-       # turn off raid
-       if [ -x /sbin/raidstop -a -f /etc/raidtab -a "$goraidtab" -eq 1 ]; then
-               # we can not use raidstop -a here because this will only stop
-               # devices listed in the default config file which is not always
-               # the case. So we look only for the active raid devices
-               if [ -f /proc/mdstat ] ; then
-                       mddevs=$(awk '/^md.* active/ {print $1}' /proc/mdstat)
-                       for mddev in $mddevs ; do
-                               show "Turning off RAID for %s" "$mddev"
-                               daemon /sbin/raidstop /dev/$mddev
-                       done
-                       unset mddev mddevs
                fi
-               # runcmd "Turning off RAID" /sbin/raidstop -a
        fi
 
        show "Remounting remaining filesystems ro mode"; busy
@@ -181,7 +167,7 @@ if [ "$runlevel" = "0" ] ; then
                       [ -x /sbin/poweroff-ups ] && /sbin/poweroff-ups
               fi
        fi
-       [ "$previous" != "unknown" ] && eval halt -d -p -f
+       [ "$previous" != "unknown" ] && halt -d -p -f
 else
        show "Please stand by while rebooting the $_rebootwhat"; ok
        if [ -f /fastboot ]; then
@@ -194,5 +180,5 @@ else
                fail
        fi
 
-       [ "$previous" != "unknown" ] && eval reboot -d -f
+       [ "$previous" != "unknown" ] && reboot -d -f
 fi