From a3eb45ccdb83d9afdcca5c1c8c0ac7b99f2d5616 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Mon, 25 Oct 1999 21:30:32 +0000
Subject: fix console checking with new consoletype program (from jakub)

---
 rc.d/init.d/functions |  4 ++--
 rc.d/rc.sysinit       | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'rc.d')

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 37b6ced7..18cdceef 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -31,8 +31,8 @@ if [ -z "$BOOTUP" ]; then
     SETCOLOR_NORMAL="echo -en \\033[0;39m"
     LOGLEVEL=1
   fi
-  if [ -x /usr/bin/tty ]; then
-    if [ "`tty`" = "not a tty" ]; then
+  if [ -x /sbin/consoletype ]; then
+    if [ "`consoletype`" = "serial" ]; then
       BOOTUP=serial
       MOVE_TO_COL=
       SETCOLOR_SUCCESS=
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index eae3f79f..2726d2a8 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -168,11 +168,17 @@ if [ -f /forcefsck ]; then
 	fsckoptions="-f $fsckoptions"
 fi
 
+if [ "$BOOTUP" != "serial" ]; then
+	fsckoptions="-C $fsckoptions"
+else
+	fsckoptions="-V $fsckoptions"
+fi
+
 _RUN_QUOTACHECK=0
 if [ ! -f /fastboot ]; then
         STRING="Checking root filesystem"
 	echo $STRING
-	initlog -c "fsck -C -T -a $fsckoptions /"
+	initlog -c "fsck -T -a $fsckoptions /"
 	rc=$?
 	
 	if [ "$rc" = "0" ]; then
@@ -368,7 +374,7 @@ fi
 if [ ! -f /fastboot ]; then
         STRING="Checking filesystems"
 	echo $STRING
-	initlog -c "fsck -C -T -R -A -a $fsckoptions"
+	initlog -c "fsck -T -R -A -a $fsckoptions"
 	rc=$?
         if [ "$rc" = "0" ]; then
 		success "$STRING"
-- 
cgit v1.2.1