aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d/init.d/network
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2008-09-16 10:23:22 +0200
committerBill Nottingham <notting@redhat.com>2008-09-16 20:13:24 -0400
commite99add4a34459654609147c8989d41cb450d0117 (patch)
tree25c1d7688504df9bfd2d570d1d04f06c8f523d8c /rc.d/init.d/network
parent0e44773240e01476b2709f9d206b86d5dfecffcf (diff)
downloadinitscripts-e99add4a34459654609147c8989d41cb450d0117.tar
initscripts-e99add4a34459654609147c8989d41cb450d0117.tar.gz
initscripts-e99add4a34459654609147c8989d41cb450d0117.tar.bz2
initscripts-e99add4a34459654609147c8989d41cb450d0117.tar.xz
initscripts-e99add4a34459654609147c8989d41cb450d0117.zip
https://bugzilla.redhat.com/show_bug.cgi?id=433702
Changes to init scripts to better support stateless: --rc.sysinit-- - don't update mtab in a r/o root - mount on sys and /dev/pts returns EBUSY on a readonly root - [ -n $CLIENTSTATE ] is always returning true, causing an unnecessary timeout --network-- - /etc/mtab may not have any mount information in the readonly-root cause, but the root mount is likely to be a network mount. Without this, nfs hangs the reboot process. --halt-- - don't try and update a read-only mtab --rwtab-- - /var/empty/sshd/etc/localtime needs to be overwritten by sshd at startup - /var/lib/random-seed is written to at shutdown; this fixes the error but doesn't return the functionality lost in a r/o /var/lib.
Diffstat (limited to 'rc.d/init.d/network')
-rwxr-xr-xrc.d/init.d/network2
1 files changed, 1 insertions, 1 deletions
diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index b1b15592..a72a92f1 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -168,7 +168,7 @@ case "$1" in
stop)
# Don't shut the network down if root is on NFS or a network
# block device.
- rootfs=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $3; }}' /etc/mtab)
+ rootfs=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/" && $3 != "rootfs") { print $3; }}' /proc/mounts)
rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' /etc/mtab)
if [[ "$rootfs" =~ ^nfs ]] || [[ "$rootopts" =~ "_netdev|_rnetdev" ]] ; then