Red Hat ENTERPRISE LINUX 5.3 - RELEASE MANIFEST, Руководство по выпуску

Страница: 227 / 240

Configuration Changes From Previous Release
227
- rw_mount_dev=$(blkid -t LABEL="$RW_LABEL" -o device | awk '{ print ;
exit }')
+ rw_mount_dev=$(blkid -t LABEL="$RW_LABEL" -l -o device)
# First try to mount scratch storage from /etc/fstab, then any
# partition with the proper label. If either succeeds, be sure
@@ -590,12 +597,12 @@
# First try to mount persistent data from /etc/fstab, then any
# partition with the proper label, then fallback to NFS
- state_mount_dev=$(blkid -t LABEL="$STATE_LABEL" -o device | awk
'{ print ; exit }')
- if mount $mountopts "$STATE_MOUNT" > /dev/null 2>&1 ; then
+ state_mount_dev=$(blkid -t LABEL="$STATE_LABEL" -l -o device)
+ if mount $mountopts $STATE_OPTIONS "$STATE_MOUNT" > /dev/null 2>&1 ; then
/bin/true
elif [ x$state_mount_dev != x ] && mount $state_mount_dev $mountopts
"$STATE_MOUNT" > /dev/null 2>&1; then
/bin/true
- elif [ -n "$CLIENTSTATE" ]; then
+ elif [ ! -z "$CLIENTSTATE" ]; then
# No local storage was found. Make a final attempt to find
# state on an NFS server.
@@ -730,23 +737,29 @@
restorecon /etc/mtab /etc/ld.so.cache /etc/blkid/blkid.tab /etc/
resolv.conf >/dev/null 2>&1
fi
-# Clear mtab
-(> /etc/mtab) &> /dev/null
-
-# Remove stale backups
-rm -f /etc/mtab~ /etc/mtab~~
-
-# Enter mounted filesystems into /etc/mtab
-mount -f /
-mount -f /proc >/dev/null 2>&1
-mount -f /sys >/dev/null 2>&1
-mount -f /dev/pts >/dev/null 2>&1
-mount -f /proc/bus/usb >/dev/null 2>&1
+if [ "$READONLY" != "yes" ] ; then
+ # Clear mtab
+ (> /etc/mtab) &> /dev/null
+
+ # Remove stale backups
+ rm -f /etc/mtab~ /etc/mtab~~
+
+ # Enter mounted filesystems into /etc/mtab
+ mount -f /
+ mount -f /proc >/dev/null 2>&1