53,59c53,59
< #if grep -q /initrd /proc/mounts && ! grep -q /initrd/loopfs /proc/mounts ; then
< #   if [ -e /initrd/dev/.devfsd ]; then
< #      umount /initrd/dev
< #   fi
< #   action $"Unmounting initrd: " umount /initrd
< #   /sbin/blockdev --flushbufs /dev/ram0 >/dev/null 2>&1
< #fi
---
> if grep -q /initrd /proc/mounts && ! grep -q /initrd/loopfs /proc/mounts ; then
>    if [ -e /initrd/dev/.devfsd ]; then
>       umount /initrd/dev
>    fi
>    action $"Unmounting initrd: " umount /initrd
>    /sbin/blockdev --flushbufs /dev/ram0 >/dev/null 2>&1
> fi
156,167d155
< # Clear mtab
< >/etc/mtab
< 
< # Remove stale backups
< rm -f /etc/mtab~ /etc/mtab~~
< 
< #mount -f /
< # Mounting NFS filesystems.
< #action $"Mounting NFS filesystems: " mount -a -v -n -t nfs
< echo $"Mounting NFS filesystems."
< mount -a -v -t nfs
< 
197,241c185,229
< #if [ -f /fastboot ] || grep -iq "fastboot" /proc/cmdline 2>/dev/null ; then
< #	fastboot=yes
< #fi
< 
< #if [ -f /fsckoptions ]; then
< #	fsckoptions=`cat /fsckoptions`
< #fi
< 
< #if [ -f /forcefsck ]; then
< #	fsckoptions="-f $fsckoptions"
< #elif [ -f /.autofsck ]; then
< #	echo $"Your system appears to have shut down uncleanly"
< #	AUTOFSCK_TIMEOUT=5
< #	[ -f /etc/sysconfig/autofsck ] && . /etc/sysconfig/autofsck
< #	if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then
< #		AUTOFSCK_OPT=-f
< #	fi
< #
< #	if [ "$PROMPT" != "no" ]; then
< #		if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then
< #			if /sbin/getkey -c $AUTOFSCK_TIMEOUT -m $"Press N within %d seconds to not force file system integrity check..." n ; then
< #				AUTOFSCK_OPT=
< #			fi
< #		else
< #			if /sbin/getkey -c $AUTOFSCK_TIMEOUT -m $"Press Y within %d seconds to force file system integrity check..." y ; then
< #				AUTOFSCK_OPT=-f
< #			fi
< #		fi
< #		echo
< #	else
< #		# PROMPT not allowed
< #		if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then
< #			echo $"Forcing file system integrity check due to default setting"
< #		else
< #			echo $"Not forcing file system integrity check due to default setting"
< #		fi
< #	fi
< #	fsckoptions="$AUTOFSCK_OPT $fsckoptions"
< #fi
< 
< #if [ "$BOOTUP" = "color" ]; then
< #	fsckoptions="-C $fsckoptions"
< #else
< #	fsckoptions="-V $fsckoptions"
< #fi
---
> if [ -f /fastboot ] || grep -iq "fastboot" /proc/cmdline 2>/dev/null ; then
> 	fastboot=yes
> fi
> 
> if [ -f /fsckoptions ]; then
> 	fsckoptions=`cat /fsckoptions`
> fi
> 
> if [ -f /forcefsck ]; then
> 	fsckoptions="-f $fsckoptions"
> elif [ -f /.autofsck ]; then
> 	echo $"Your system appears to have shut down uncleanly"
> 	AUTOFSCK_TIMEOUT=5
> 	[ -f /etc/sysconfig/autofsck ] && . /etc/sysconfig/autofsck
> 	if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then
> 		AUTOFSCK_OPT=-f
> 	fi
> 
> 	if [ "$PROMPT" != "no" ]; then
> 		if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then
> 			if /sbin/getkey -c $AUTOFSCK_TIMEOUT -m $"Press N within %d seconds to not force file system integrity check..." n ; then
> 				AUTOFSCK_OPT=
> 			fi
> 		else
> 			if /sbin/getkey -c $AUTOFSCK_TIMEOUT -m $"Press Y within %d seconds to force file system integrity check..." y ; then
> 				AUTOFSCK_OPT=-f
> 			fi
> 		fi
> 		echo
> 	else
> 		# PROMPT not allowed
> 		if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then
> 			echo $"Forcing file system integrity check due to default setting"
> 		else
> 			echo $"Not forcing file system integrity check due to default setting"
> 		fi
> 	fi
> 	fsckoptions="$AUTOFSCK_OPT $fsckoptions"
> fi
> 
> if [ "$BOOTUP" = "color" ]; then
> 	fsckoptions="-C $fsckoptions"
> else
> 	fsckoptions="-V $fsckoptions"
> fi
244,281c232,269
< _RUN_QUOTACHECK=1
< #ROOTFSTYPE=`awk '/ \/ / { print $3 }' /proc/mounts`
< #if [ -z "$fastboot" -a "X$ROOTFSTYPE" != "Xnfs" ]; then 
< #
< #        STRING=$"Checking root filesystem"
< #	echo $STRING
< #	initlog -c "fsck -T -a $fsckoptions /"
< #	rc=$?
< #	
< #	if [ "$rc" = "0" ]; then
< #		success "$STRING"
< #		echo
< #	elif [ "$rc" = "1" ]; then
< #	        passed "$STRING"
< #		echo
< #        fi
< #	
< #        # A return of 2 or higher means there were serious problems.
< #	if [ $rc -gt 1 ]; then
< #		failure "$STRING"
< #		echo
< #		echo
< #		echo $"*** An error occurred during the file system check."
< #		echo $"*** Dropping you to a shell; the system will reboot"
< #		echo $"*** when you leave the shell."
< #
< #		PS1=$"(Repair filesystem) \# # "; export PS1
< #		sulogin
< #
< #		echo $"Unmounting file systems"
< #		umount -a
< #		mount -n -o remount,ro /
< #		echo $"Automatic reboot in progress."
< #		reboot -f
< #	elif [ "$rc" = "1" ]; then
< #		_RUN_QUOTACHECK=1
< #	fi
< #fi
---
> _RUN_QUOTACHECK=0
> ROOTFSTYPE=`awk '/ \/ / { print $3 }' /proc/mounts`
> if [ -z "$fastboot" -a "X$ROOTFSTYPE" != "Xnfs" ]; then 
> 
>         STRING=$"Checking root filesystem"
> 	echo $STRING
> 	initlog -c "fsck -T -a $fsckoptions /"
> 	rc=$?
> 	
> 	if [ "$rc" = "0" ]; then
> 		success "$STRING"
> 		echo
> 	elif [ "$rc" = "1" ]; then
> 	        passed "$STRING"
> 		echo
>         fi
> 	
>         # A return of 2 or higher means there were serious problems.
> 	if [ $rc -gt 1 ]; then
> 		failure "$STRING"
> 		echo
> 		echo
> 		echo $"*** An error occurred during the file system check."
> 		echo $"*** Dropping you to a shell; the system will reboot"
> 		echo $"*** when you leave the shell."
> 
> 		PS1=$"(Repair filesystem) \# # "; export PS1
> 		sulogin
> 
> 		echo $"Unmounting file systems"
> 		umount -a
> 		mount -n -o remount,ro /
> 		echo $"Automatic reboot in progress."
> 		reboot -f
> 	elif [ "$rc" = "1" ]; then
> 		_RUN_QUOTACHECK=1
> 	fi
> fi
316,319c304,307
< ## Remount the root filesystem read-write.
< #state=`awk '/(^\/dev\/root| \/ )/ { print $4 }' /proc/mounts`
< #[ "$state" != "rw" ] && \
< #  action $"Remounting root filesystem in read-write mode: " mount -n -o remount,rw /
---
> # Remount the root filesystem read-write.
> state=`awk '/(^\/dev\/root| \/ )/ { print $4 }' /proc/mounts`
> [ "$state" != "rw" ] && \
>   action $"Remounting root filesystem in read-write mode: " mount -n -o remount,rw /
329,339c317,327
< ## Clear mtab
< #>/etc/mtab
< #
< ## Remove stale backups
< #rm -f /etc/mtab~ /etc/mtab~~
< 
< ## Enter root, /proc and (potentially) /proc/bus/usb and devfs into mtab.
< #mount -f /
< #mount -f /proc
< #[ -f /proc/bus/usb/devices ] && mount -f -t usbdevfs usbdevfs /proc/bus/usb
< #[ -e /dev/.devfsd ] && mount -f -t devfs devfs /dev 
---
> # Clear mtab
> >/etc/mtab
> 
> # Remove stale backups
> rm -f /etc/mtab~ /etc/mtab~~
> 
> # Enter root, /proc and (potentially) /proc/bus/usb and devfs into mtab.
> mount -f /
> mount -f /proc
> [ -f /proc/bus/usb/devices ] && mount -f -t usbdevfs usbdevfs /proc/bus/usb
> [ -e /dev/.devfsd ] && mount -f -t devfs devfs /dev 
485,520c473,508
< _RUN_QUOTACHECK=1
< ## Check filesystems
< #if [ -z "$fastboot" ]; then
< #        STRING=$"Checking filesystems"
< #	echo $STRING
< #	initlog -c "fsck -T -R -A -a $fsckoptions"
< #	rc=$?
< #        if [ "$rc" = "0" ]; then
< #		success "$STRING"
< #		echo
< #	elif [ "$rc" = "1" ]; then
< #	        passed "$STRING"
< #		echo
< #	fi
< #
< #	# A return of 2 or higher means there were serious problems.
< #	if [ $rc -gt 1 ]; then
< #	        failure "$STRING"
< #		echo
< #		echo
< #		echo $"*** An error occurred during the file system check."
< #		echo $"*** Dropping you to a shell; the system will reboot"
< #		echo $"*** when you leave the shell."
< #
< #		PS1=$"(Repair filesystem) \# # "; export PS1
< #		sulogin
< #
< #		echo $"Unmounting file systems"
< #		umount -a
< #		mount -n -o remount,ro /
< #		echo $"Automatic reboot in progress."
< #		reboot -f
< #	elif [ "$rc" = "1" -a -x /sbin/quotacheck ]; then
< #		_RUN_QUOTACHECK=1
< #	fi
< #fi
---
> _RUN_QUOTACHECK=0
> # Check filesystems
> if [ -z "$fastboot" ]; then
>         STRING=$"Checking filesystems"
> 	echo $STRING
> 	initlog -c "fsck -T -R -A -a $fsckoptions"
> 	rc=$?
>         if [ "$rc" = "0" ]; then
> 		success "$STRING"
> 		echo
> 	elif [ "$rc" = "1" ]; then
> 	        passed "$STRING"
> 		echo
> 	fi
> 
> 	# A return of 2 or higher means there were serious problems.
> 	if [ $rc -gt 1 ]; then
> 	        failure "$STRING"
> 		echo
> 		echo
> 		echo $"*** An error occurred during the file system check."
> 		echo $"*** Dropping you to a shell; the system will reboot"
> 		echo $"*** when you leave the shell."
> 
> 		PS1=$"(Repair filesystem) \# # "; export PS1
> 		sulogin
> 
> 		echo $"Unmounting file systems"
> 		umount -a
> 		mount -n -o remount,ro /
> 		echo $"Automatic reboot in progress."
> 		reboot -f
> 	elif [ "$rc" = "1" -a -x /sbin/quotacheck ]; then
> 		_RUN_QUOTACHECK=1
> 	fi
> fi
