[Devil-linux-commit] build/config/etc/initrd linuxrc,1.82,1.83 mount_cdrom,1.34,1.35

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

Update of /cvsroot/devil-linux/build/config/etc/initrd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20943

Modified Files:
	linuxrc mount_cdrom 
Log Message:
oops, this wasn't supposed to be commited


Index: linuxrc
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/linuxrc,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- linuxrc	6 Oct 2005 19:03:32 -0000	1.82
+++ linuxrc	6 Oct 2005 19:20:55 -0000	1.83
@@ -43,7 +43,7 @@
 	for SRC in "$@"
 	do	
 		echo -n "Checking for \"$FILE\" on \"$SRC\" ... "
-		if mount -n -t auto $SRC /floppy   ; then
+		if mount -n -t auto $SRC /floppy >/dev/null 2>&1  ; then
 			if [ -e /floppy/$FILE ] ; then
 				$GREEN
 				echo "success!"
@@ -230,7 +230,7 @@
 	for CFG_SRC in $CONFIG_SRC_LIST
 	do
 		echo -e "Looking for empty configuation media on $CFG_SRC"
-		if mount -n -t auto $CFG_SRC /floppy ; then
+		if mount -n -t auto $CFG_SRC /floppy >/dev/null 2>&1 ; then
 			umount /floppy # in case user swaps floppy when we are accepting input
 			# offer to copy the configuration file if device is not a CD
 			IS_CDROM=$(echo $CDROMS | grep "${CFG_SRC##/*/}" )
@@ -251,7 +251,7 @@
 						$NORMAL
 						continue
 					fi
-					mount -n -t auto $CFG_SRC /floppy  || continue
+					mount -n -t auto $CFG_SRC /floppy >/dev/null 2>&1 || continue
 					cp -i /cdrom/config/etc.tar.bz2 /floppy/ || continue
 					umount /cdrom
 					sync

Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- mount_cdrom	6 Oct 2005 19:03:32 -0000	1.34
+++ mount_cdrom	6 Oct 2005 19:20:55 -0000	1.35
@@ -35,7 +35,7 @@
 for disk in $CDROMS
 do
 	echo -n "checking $disk "
-	if mount -n -t iso9660 -o ro $disk $1; then
+	if mount -n -t iso9660 -o ro $disk $1 2> /dev/null; then
 		if [ -e $1/DEVIL-LINUX ] ; then
 			if [ "$3" != "silent" ]; then
 				$YELLOW
@@ -65,7 +65,7 @@
 for disk in $DISCS
 do
 	echo -n "checking $disk "
-	if mount -n -t auto -o rw,noatime $disk /mnt ; then
+	if mount -n -t auto -o rw,noatime $disk /mnt 2> /dev/null; then
 		if [ -e /mnt/DEVIL-LINUX ] ; then
 			$GREEN
 			echo "media found"
@@ -118,7 +118,7 @@
 				# is attempted to umount it in pre_init but will fail
 				# because bootcd.iso is still mounted inside it.
 				# RO will make it less painfull.
-				mount -o remount,ro,noatime $disk
+				mount -o remount,ro,noatime $disk 2> /dev/null
 				mount -o loop=/dev/loop0 -t iso9660 /mnt/bootcd.iso $1 || return 1
 				echo $disk > /shm/DL_DEVICE
 				dl_version=`cat /mnt/DEVIL-LINUX 2> /dev/null`