Red Hat Enterprise Linux 5 5.3 Release Notes - Red Hat Customer ...

+[ -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 @@
$"Unmounting file systems (retry): " \
-f
-[ -f /proc/bus/usb/devices ] && umount /proc/bus/usb
+[ -f /proc/bus/usb/devices ] && $UMOUNT /proc/bus/usb
[ -f /etc/crypttab ] && \
LANG=C action $"Stopping disk encryption: " halt_crypto
@@ -183,7 +184,7 @@
awk '$2 !~ /\/(|dev|proc|selinux)$/ && $1 !~ /^\/dev\/ram/ { print $2 }' \
/proc/mounts | sort -r | \
while read line; do
- fstab-decode umount -f $line
+ fstab-decode $UMOUNT -f $line
done
if [ -x /sbin/halt.local ]; then
nfs-utils-1.0.9-33.el5.i386.rpm: /etc/rc.d/init.d/nfslock
---
+++
@@ -33,7 +33,7 @@
RETVAL=0
start() {
# Check that networking is up.
- [ "${NETWORKING}" = "no" ] && exit 6
+ [ "${NETWORKING}" != "yes" ] && exit 6
if [ "$USERLAND_LOCKD" ] ; then
[ -x /sbin/rpc.lockd ] || exit 5
@@ -46,9 +46,12 @@
STATDARG=""
fi
Red Hat Enterprise Linux 5 5.3 Release Notes 191
- if [ -f /var/lock/subsys/nfslock ]; then
- return $RETVAL
+ # Make sure the rpc.statd is not already running.
+ if status rpc.statd > /dev/null ; then
+ exit 0
fi
+ rm -f /var/lock/subsys/nfslock
+
# Start daemons.
if [ "$USERLAND_LOCKD" ]; then
echo -n $"Starting NFS locking: "
@@ -64,10 +67,14 @@
/sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1
fi
echo -n $"Starting NFS statd: "
+ # Set statd's local hostname if defined
+ [ -n "${STATD_HOSTNAME}" ] && STATDARG="$STATDARG -n ${STATD_HOSTNAME}"