[Devil-linux-commit] build/config/etc/initrd mount_cdrom, 1.25.2.19, 1.25.2.20

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

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

Modified Files:
      Tag: rel-1-2-patches
	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.25.2.19
retrieving revision 1.25.2.20
diff -u -d -r1.25.2.19 -r1.25.2.20
--- mount_cdrom	9 Jun 2006 22:30:06 -0000	1.25.2.19
+++ mount_cdrom	9 Oct 2006 14:20:01 -0000	1.25.2.20
@@ -131,7 +131,7 @@
 	## FIXME
 	# we should probably define these somewhere more central
 	local RAMDISK=/shm/sys  # this has to be under /shm as this one is mount moved in linuxrc
-	local FILEMOUNT=/mnt
+	local FILEMOUNT=/cd
 	local ISOFILE=bootcd.iso
 
 	# show that we are configured to run from ram
@@ -301,12 +301,12 @@
 for disk in $PARTITIONS
 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 *"
@@ -314,21 +314,21 @@
 				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
                                     $BLUE
                                     echo "Upgrading System Boot Files"
                                     $NORMAL
 
-                                    mount -o loop -t iso9660 /mnt/bootcd.iso /cdrom
+                                    mount -o loop -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
                                     
@@ -336,7 +336,7 @@
 				    #$GREEN
                                     #echo "Mounting old version"
                                     #$NORMAL
-				    mount -o loop -t iso9660 /mnt/bootcd.iso.old ${mountpoint} || exit 1
+				    mount -o loop -t iso9660 /cd/bootcd.iso.old ${mountpoint} || exit 1
 				    cd /cdrom
     				    #change to new root
         			    pivot_root . initrd
@@ -351,7 +351,7 @@
 				sync
 				$NORMAL
 			fi
-			if [ -e /mnt/bootcd.iso ] ; then
+			if [ -e /cd/bootcd.iso ] ; then
 				echo $disk > /shm/DL_DEVICE
 
 				# run from ram if correct variable is set
@@ -362,7 +362,7 @@
 					# 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 -t iso9660 /mnt/bootcd.iso ${mountpoint} || exit 1
+					mount -o loop -t iso9660 /cd/bootcd.iso ${mountpoint} || exit 1
 				fi
 				exit 0
 			fi
@@ -370,7 +370,7 @@
 			$YELLOW
 			echo "wrong media"
 			$NORMAL
-			umount /mnt
+			umount /cd
 		fi
 	else
 		$RED