[Initng-svn] r3673 - initng-ifiles/trunk/initfiles/system

[svn at initng.thinktux.net]

Author: biebl
Date: Tue Apr  4 18:48:43 2006
New Revision: 3673

Modified:
   initng-ifiles/trunk/initfiles/system/checkfs.ii
   initng-ifiles/trunk/initfiles/system/mountroot.ii
Log:
Use logsave to correctly initialize the terminal before we start fsck. Closes #83
Progress bars are now displayed properly.
Another solution would be, to use the code from logsave and integrate it into initng.


Modified: initng-ifiles/trunk/initfiles/system/checkfs.ii
==============================================================================
--- initng-ifiles/trunk/initfiles/system/checkfs.ii	(original)
+++ initng-ifiles/trunk/initfiles/system/checkfs.ii	Tue Apr  4 18:48:43 2006
@@ -47,7 +47,7 @@
 			if [ "${VERBOSE}" = no ]
 			then
 				echo "Checking file systems"
-				logsave -s ${FSCK_LOGFILE} fsck ${spinner} -R -A ${fix} ${force} ${FSCKTYPES_OPT}
+				@logsave@ -s ${FSCK_LOGFILE} @fsck@ ${spinner} -R -A ${fix} ${force} ${FSCKTYPES_OPT}
 				FSCKCODE=${?}
 				if [ ${FSCKCODE} -gt 1 ]
 				then
@@ -61,7 +61,7 @@
 				else
 					echo "Will now check all file systems"
 				fi
-				logsave -s ${FSCK_LOGFILE} fsck ${spinner} -V -R -A ${fix} ${force} ${FSCKTYPES_OPT}
+				@logsave@ -s ${FSCK_LOGFILE} @fsck@ ${spinner} -V -R -A ${fix} ${force} ${FSCKTYPES_OPT}
 				FSCKCODE=${?}
 				if [ ${FSCKCODE} -gt 1 ]
 				then
@@ -73,7 +73,7 @@
 			fi
 		fi
 
-		rm -f /fastboot /forcefsck
+		@rm@ -f /fastboot /forcefsck
 #elsed
 		if [ -f /fastboot ]
 		then
@@ -82,10 +82,10 @@
 			if [ -f /forcefsck ]
 			then
 				echo "A full fsck has been forced"
-				@/sbin/fsck@ -C -R -A -a -f || echo "fsck error: ${?}" >&2
+				@logsave@ /dev/null @fsck@ -C -R -A -a -f || echo "fsck error: ${?}" >&2
 				@rm@ -f /forcefsck
 			else
-				@/sbin/fsck@ -C -T -R -A -a || echo "fsck error: ${?}" >&2
+				@logsave@ /dev/null @fsck@ -C -T -R -A -a || echo "fsck error: ${?}" >&2
 			fi
 		fi
 #endd

Modified: initng-ifiles/trunk/initfiles/system/mountroot.ii
==============================================================================
--- initng-ifiles/trunk/initfiles/system/mountroot.ii	(original)
+++ initng-ifiles/trunk/initfiles/system/mountroot.ii	Tue Apr  4 18:48:43 2006
@@ -39,7 +39,7 @@
 			then
 				echo "Checking root filesystem (full fsck forced)"
 				@mount@ -n -o remount,ro /
-				@/sbin/fsck@ -C -a -f /
+				@logsave@ /dev/null @fsck@ -C -a -f /
 				# /forcefsck isn't deleted because system/mountfs need it.
 				# it'll be deleted in that script.
 				retval=${?}
@@ -60,7 +60,7 @@
 				then
 					echo "Checking root filesystem ..."
 					@mount@ -n -o remount,ro /
-					@/sbin/fsck@ -C -T -a /
+					@logsave@ /dev/null @fsck@ -C -T -a /
 					retval=${?}
 				else
 					echo "Skipping root filesystem check (fstab's passno == 0) ..."