System information

+ exit 1
+ fi
+fi
+}
#
# See how we were called.
@@ -40,6 +70,11 @ @
}
stop() {
+ root_dev=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}'
/etc/mtab)
+ dm_num=`dmsetup info -c --noheadings -o m inor $root_dev`
+ root_dm_device="dm -$ dm_num"
+ [ -d $ syspath/$root_dm_device ] && teardown_slaves $syspath/$root_dm_device
+
echo -n $"Stopping $prog daemon: "
killproc $DAEMON
RETVAL=$ ?
initscripts-8.45.19.EL-1.i386.rpm: /etc/rc.d/rc6.d/S01reboot
---
+++
@@ -10,6 +10,9 @@
NOLOCALE=1
. /etc/init.d/functions
+
+UMOUNT="um ount"
+[ ! -w /etc ] && UMOUNT="umount -n"
action() {
echo -n "$1 "
@@ -131,7 +134,7 @@
# Try to unmount tmpfs filesystems to avoid swapping them in. Ignore failures.
tmpfs=$(awk '$2 ~ /^\/($|proc|dev)/ { next; }
$3 == "tmpfs" { print $2; }' /proc/mounts | sort -r)
-[ -n "$tmpfs" ] && fstab-decode um ount $tmpfs 2>/dev/null
+[ -n "$tmpfs" ] && fstab-decode $UMOUNT $tmpfs 2>/dev/null
# Turn off swap, then unmount file systems.
[ -f /proc/swaps ] && SWAPS=`awk '! /^Filename/ { print $ 1 }' /proc/swaps`
@@ -143,8 +146,6 @@
backdev=$ (/sbin/cryptsetup status "$dst" \
| awk '$1 == "device:" { print $2 }')
/sbin/cryptsetup remove "$dst"
- # Leave partition with a blank plain-text swap
- mkswap "$ backdev" > /dev/null
fi
done
fi
@@ -170,7 +171,7 @@
$"Unm ounting file systems (retry): " \
-f
-[ -f /proc/bus/usb/devices ] && um ount /proc/bus/usb
+[ -f /proc/bus/usb/devices ] && $UMOUNT /proc/bus/usb
[ -f /etc/crypttab ] && \
LANG=C action $"Stopping disk encryption: " halt_crypto
Red Hat Enterprise Linux 5 5.3 Release Notes
190