[Devil-linux-commit] build/config/etc/initrd mount_cdrom, 1.37, 1.38

[Bruce S. <bl...@us...>]

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

Modified Files:
	mount_cdrom 
Log Message:
sym-linked /mnt to /shm/mnt so mount points can be created


Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- mount_cdrom	3 May 2006 19:44:58 -0000	1.37
+++ mount_cdrom	9 Oct 2006 14:26:23 -0000	1.38
@@ -78,12 +78,12 @@
 for disk in $DISCS
 do
 	echo -n "checking $disk "
-	if mount -n -t auto -o rw,noatime $disk /mnt 2> /dev/null; then
-		if [ -e /mnt/DEVIL-LINUX ] ; then
+	if mount -n -t auto -o rw,noatime $disk /cd 2> /dev/null; then
+		if [ -e /cd/DEVIL-LINUX ] ; then
 			$GREEN
 			echo "media found"
 			$NORMAL
-			if [ -e /mnt/bootcd.iso.new ] ; then
+			if [ -e /cd/bootcd.iso.new ] ; then
 				$BLUE
 				echo "****************************"
 				echo "* Found Devil-Linux update *"
@@ -91,32 +91,32 @@
 				echo
 				echo "Backing up old version"
 				$RED
-				rm -f /mnt/bootcd.iso.old &> /dev/null
-				mv /mnt/bootcd.iso /mnt/bootcd.iso.old || echo "Backup failed"
+				rm -f /cd/bootcd.iso.old &> /dev/null
+				mv /cd/bootcd.iso /cd/bootcd.iso.old || echo "Backup failed"
 				$BLUE
 				echo "Activating new version"
 				$RED
-				rm -f /mnt/bootcd.iso &> /dev/null
-				if mv /mnt/bootcd.iso.new /mnt/bootcd.iso ; then
+				rm -f /cd/bootcd.iso &> /dev/null
+				if mv /cd/bootcd.iso.new /cd/bootcd.iso ; then
 				    # create flag file, so the other scripts know about it
 				    touch /shm/dl_iso_replaced
                                     $BLUE
                                     echo "Upgrading System Boot Files"
                                     $NORMAL
 
-                                    mount -o loop=/dev/loop0 -t iso9660 /mnt/bootcd.iso /cdrom
+                                    mount -o loop=/dev/loop0 -t iso9660 /cd/bootcd.iso /cdrom
 
-                                    cp -fp /cdrom/boot/* /mnt/boot/ 2> /dev/null
-                                    cp -fp /cdrom/DEVIL-LINUX /mnt/
+                                    cp -fp /cdrom/boot/* /cd/boot/ 2> /dev/null
+                                    cp -fp /cdrom/DEVIL-LINUX /cd/
                                     sync
 				    umount /cdrom &> /dev/null
                                     
                                     $GREEN
                                     echo "Mounting old version"
                                     $NORMAL
-				    mount -o loop=/dev/loop0 -t iso9660 /mnt/bootcd.iso.old $1 || return 1
+				    mount -o loop=/dev/loop0 -t iso9660 /cd/bootcd.iso.old $1 || return 1
 				    echo $disk > /shm/DL_DEVICE
-				    dl_version=`cat /mnt/DEVIL-LINUX 2> /dev/null`
+				    dl_version=`cat /cd/DEVIL-LINUX 2> /dev/null`
                                     exit 0
 				else
 					echo "Activation failed"
@@ -125,16 +125,16 @@
 				sync
 				$NORMAL
 			fi
-			if [ -e /mnt/bootcd.iso ] ; then
+			if [ -e /cd/bootcd.iso ] ; then
 				# since this could be flash disk, lets make read-only.
 				# Should not write to this mount anymore anyway. It
 				# 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 2> /dev/null
-				mount -o loop=/dev/loop0 -t iso9660 /mnt/bootcd.iso $1 || return 1
+				mount -o loop=/dev/loop0 -t iso9660 /cd/bootcd.iso $1 || return 1
 				echo $disk > /shm/DL_DEVICE
-				dl_version=`cat /mnt/DEVIL-LINUX 2> /dev/null`
+				dl_version=`cat /cd/DEVIL-LINUX 2> /dev/null`
 				if [ "$3" != "silent" ]; then
 					$YELLOW
 					echo -e "\nFound ISO ($dl_version) on $disk"
@@ -146,7 +146,7 @@
 			$YELLOW
 			echo "wrong media"
 			$NORMAL
-			umount /mnt
+			umount /cd
 		fi
 	else
 		$RED