[Devil-linux-commit] build/config/etc/initrd linuxrc,1.63,1.64

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

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

Modified Files:
	linuxrc 
Log Message:
Fixed problem of /floppy not umount'ing when new config copied to media.


Index: linuxrc
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/linuxrc,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- linuxrc	26 Feb 2004 02:41:31 -0000	1.63
+++ linuxrc	4 Mar 2004 14:49:53 -0000	1.64
@@ -112,9 +112,9 @@
 	do
 		echo -e "Looking for empty configuation media on $CFG_SRC"
 		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
 			if [ ! "${CFG_SRC##/*/}" = "cd" ];then
-				umount /floppy # in case user swaps floppy when we are accepting input
 				beep;
 				$YELLOW
 				echo -e "\n*** Found empty configuration media. ***"
@@ -133,6 +133,7 @@
 					fi
 					mount -n -t auto $CFG_SRC /floppy >/dev/null 2>&1 || continue
 					cp -i /cdrom/config/etc.tar.bz2 /floppy/ || continue
+					umount /cdrom
 					sync
 					DL_CONFIG_SOURCE=$CFG_SRC
 					continue 2
@@ -199,7 +200,7 @@
 fi
 
 # unmount config media
-umount /floppy &> /dev/null
+umount /floppy
 
 # Update modules for SCSI CD (if any)
 if [ -s /shm/.probed_modules ] ; then