[Devil-linux-commit] build/config/etc/initrd mount_cdrom, 1.53, 1.54

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

Update of /cvsroot/devil-linux/build/config/etc/initrd
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv11249/config/etc/initrd

Modified Files:
	mount_cdrom 
Log Message:
only mount CD-ROM or USB media if it has the correct version of Devil-Linux  (Heiko Zuerker + Andrzej Odyniec)


Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- mount_cdrom	8 Sep 2010 04:50:10 -0000	1.53
+++ mount_cdrom	26 Nov 2010 13:31:15 -0000	1.54
@@ -324,19 +324,28 @@
 	echo -n "checking $disk "
 	if /sbin/mount -n -t iso9660 -o ro $disk ${mountpoint} 2> /dev/null; then
 		if [ -e ${mountpoint}/DEVIL-LINUX ] ; then
-			if [ !  $silent ]; then
-				$YELLOW
-				echo -e "Found on $disk"
-				$NORMAL
-			fi
-			echo $disk > /shm/DL_DEVICE
+			MYVER=$(cat VERSION)
+			MEDIAVER=$(cat ${mountpoint}/DEVIL-LINUX)
+			if [ "${MYVER}" == "${MEDIAVER}" ]; then
+				if [ !  $silent ]; then
+					$GREEN
+					echo -e "Found Devil-Linux v${MEDIAVER}"
+					$NORMAL
+				fi
+				echo $disk > /shm/DL_DEVICE
 
-                        # run from ram if correct variable is set
-			IMAGE="bootcd.iso"
-			IMAGEFS="iso9660"
-                        run_from_ram --cdrom
+				# run from ram if correct variable is set
+				IMAGE="bootcd.iso"
+				IMAGEFS="iso9660"
+				run_from_ram --cdrom
 
-			exit 0
+				exit 0
+			else
+				$RED
+				echo "Wrong version (${MEDIAVER})"
+				$NORMAL
+				/sbin/umount ${mountpoint}
+			fi
 		else
 			$YELLOW
 			echo "wrong media"