[Devil-linux-commit] build/config/etc/initrd linuxrc,1.47,1.48 mount_cdrom,1.19,1.20

[<smi...@us...>]

Update of /cvsroot/devil-linux/build/config/etc/initrd
In directory sc8-pr-cvs1:/tmp/cvs-serv24528/config/etc/initrd

Modified Files:
	linuxrc mount_cdrom 
Log Message:
initrd is colorfull again
fixed some minor issues


Index: linuxrc
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/linuxrc,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- linuxrc	9 Nov 2003 17:17:04 -0000	1.47
+++ linuxrc	9 Nov 2003 17:38:14 -0000	1.48
@@ -19,6 +19,8 @@
 RED="echo -en \\033[1;31m"
 alias beep='echo -en "\007"'
 
+alias l="ls -la"
+
 $RED
 echo
 echo "********************************************************************************"
@@ -80,7 +82,7 @@
 CONFIG_SRC_LIST="$CDROM_IDE $CDROM_SCSI $PARTITIONS_IDE $PARTITIONS_SCSI /dev/fd0 /dev/fd1"
 DL_CONFIG_SOURCE=""
 
-$SUCCESS
+$GREEN
 echo -e "searching for configuration media"
 $NORMAL
 
@@ -91,17 +93,17 @@
 		if mount -n -t auto $CFG_SRC /floppy >/dev/null 2>&1  ; then
 
 			if [ -e /floppy/etc.tar.bz2 ] ; then
-				$SUCCESS
-				echo "Found configuration on $CFG_SRC"
+				$YELLOW
+				echo -e "Found configuration on $CFG_SRC"
 				$NORMAL
 				DL_CONFIG_SOURCE=$CFG_SRC
 				continue 2
 			else
+				umount /floppy # in case user swaps floppy when we are accepting input
 				# offer to copy the configuration file if device is not a CD
 				if [ ! "${CFG_SRC##/*/}" = "cd" ];then
 					beep;
-					umount /floppy # in case user swaps floppy when we are accepting input
-					$SUCCESS
+					$YELLOW
 					echo -e "\n*** Found empty configuration media. ***"
 					$NORMAL
 					echo -n "Should I copy default configuration to it?"
@@ -111,8 +113,8 @@
 							/probe_all_scsi_modules
 						fi
 						if ! /mount_cdrom /cdrom noreboot ; then
-							$FAILURE
-							echo "Cannot find CD drive - try probing for SCSI controllers"
+							$RED
+							echo -e "Cannot find CD drive - try probing for SCSI controllers"
 							$NORMAL
 							continue
 						fi
@@ -136,8 +138,8 @@
 	fi
 	#[ -n "$DL_CONFIG_SOURCE" ] && continue
 	beep; sleep 1; beep; sleep 1; beep;
-	$FAILURE
-	echo "Please insert Configuration Media and press 'ENTER'"
+	$RED
+	echo -e "Please insert Configuration Media and press 'ENTER'"
 	$NORMAL
 	read ANS
 	echo

Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- mount_cdrom	8 Nov 2003 21:04:23 -0000	1.19
+++ mount_cdrom	9 Nov 2003 17:38:14 -0000	1.20
@@ -32,7 +32,7 @@
 		if [ -e $1/DEVIL-LINUX ] ; then
 			if [ "$3" != "silent" ]; then
 				$YELLOW
-				echo -e "\nFound on $disk"
+				echo -e "Found on $disk"
 				$NORMAL
 			fi
 			exit 0