- hacks for nfsroot, romfs

svn-id: @677

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 9487fdac255b615fcc7d14dd716c45166b486693..9fc62b688e426480c324a70c04b3ed78522950aa 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # /etc/rc.d/rc.sysinit - run once at boot time
-# $Id: rc.sysinit,v 1.49 2000/03/08 16:29:09 misiek Exp $
+# $Id: rc.sysinit,v 1.50 2000/03/20 06:58:14 waszi Exp $
 #
 # Taken in part from Miquel van Smoorenburg's bcheckrc.
 # Changes:      Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
@@ -108,11 +108,8 @@ if [ -f /forcefsck ]; then
         fsckoptions="-f $fsckoptions"
 fi
 
-# Test for NFS Root
-NFSROOT=`cat /proc/mounts | awk '{ if ($2 ~ /^\/$/ && $3 ~ /^nfs$/) print $3 }'`
-
 _RUN_QUOTACHECK=0
-if [ ! -f /fastboot -a ! -n "$NFSROOT" ]; then
+if [ ! -f /fastboot -o awk '{ if ($2 ~ /^\/$/ && ( $3 ~ /^(nfs|romfs)$/ || $6 ~ /^0$/ ) ) exit 0 ; else exit 1}' /etc/fstab ]; then
        show "Checking root filesystems."; started
        initlog -c "fsck -C -T -a $fsckoptions /"
 
@@ -161,7 +158,7 @@ fi
 run_cmd "Remounting root filesystem in rw mode" mount -n -o remount,rw /
 
 # Update quotas if fsck was run on /.
-if [ X"$_RUN_QUOTACHECK" = "X1" -a -x /sbin/quotacheck -a ! -n "$NFSROOT" ]; then
+if [ X"$_RUN_QUOTACHECK" = "X1" -a -x /sbin/quotacheck ]; then
         run_cmd "Checking root filesystem quotas" /sbin/quotacheck -v /
 fi