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

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/config/etc/initrd
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8000

Modified Files:
	mount_cdrom 
Log Message:

- bug fixing and clearing 


Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- mount_cdrom	23 Jan 2009 01:55:59 -0000	1.47
+++ mount_cdrom	26 Jan 2009 23:55:34 -0000	1.48
@@ -295,6 +295,7 @@
 DEVICES_IDE=`find /dev -name "hd??" 2> /dev/null`
 DISCS_SCSI=`find /dev -name "sd??" 2> /dev/null`
 DISCS="$DEVICES_IDE $DISCS_SCSI"
+FILEMOUNT="/cd"
 
 if [ "$DEVICE_USER_ONLY" != "0" ]; then
     $RED
@@ -306,9 +307,9 @@
 for disk in $DISCS
 do
 	echo -n "   checking $disk ... "
-	umount /cd 2> /dev/null 
-	if /sbin/mount -n -t auto -o rw,noatime $disk /cd 2> /dev/null; then
-		if [ -e /cd/DEVIL-LINUX ] ; then
+	umount ${FILEMOUNT} 2> /dev/null 
+	if /sbin/mount -n -t auto -o rw,noatime $disk ${FILEMOUNT} 2> /dev/null; then
+		if [ -e ${FILEMOUNT}/DEVIL-LINUX ] ; then
 			$GREEN
 			echo "media found"
 			$NORMAL
@@ -358,14 +359,14 @@
 				sync
 				$NORMAL
 			fi
-			if [[ $(ls /cd/bootcd.* 2>/dev/null) != ""  ]]; then 
+
+			if [[ "$(ls ${FILEMOUNT}/bootcd.* | grep -v '.old' 2>/dev/null)" != ""  ]]; then 
 				echo $disk > /shm/DL_DEVICE
 
-        			FILEMOUNT="/cd"
-				if [ -e /cd/bootcd.squash ] ; then
+				if [ -e ${FILEMOUNT}/bootcd.squash ] ; then
 					IMAGE="bootcd.squash"
 					IMAGEFS="squashfs"
-				elif [ -e /cd/bootcd.iso ] ; then
+				elif [ -e ${FILEMOUNT}/bootcd.iso ] ; then
 					IMAGE="bootcd.iso"
 					IMAGEFS="iso9660"
 				else
@@ -389,7 +390,7 @@
 					# RO will make it less painfull.
 					/sbin/mount -o remount,ro,noatime $disk 2> /dev/null
 					/sbin/mount -o loop -t ${IMAGEFS} ${FILEMOUNT}/${IMAGE} ${mountpoint} || return 1
-					dl_version=`cat /cd/DEVIL-LINUX 2> /dev/null`
+					dl_version=`cat ${FILEMOUNT}/DEVIL-LINUX 2> /dev/null`
 					if [ !  $silent ]; then
 						$YELLOW
 						echo -e "\nFound ISO ($dl_version) on $disk"
@@ -402,7 +403,7 @@
 			$YELLOW
 			echo "wrong media"
 			$NORMAL
-			/sbin/umount /cd
+			/sbin/umount ${FILEMOUNT}
 		fi
 	else
 		$RED