From e99add4a34459654609147c8989d41cb450d0117 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Tue, 16 Sep 2008 10:23:22 +0200
Subject: 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.
---
 rc.d/init.d/network | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rc.d/init.d/network')

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
-- 
cgit v1.2.1