Update of /cvsroot/devil-linux/build/config/etc/initrd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15419/config/etc/initrd
Modified Files:
linuxrc mount_cdrom
Log Message:
- more fixes when config device = DL iso device
Index: linuxrc
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/linuxrc,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- linuxrc 15 Feb 2004 16:59:57 -0000 1.61
+++ linuxrc 15 Feb 2004 17:49:09 -0000 1.62
@@ -133,7 +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
fi
@@ -150,6 +150,8 @@
done
unset ANS RET
+DL_DEVICE=$(cat /shm/DL_DEVICE)
+export DL_DEVICE
export DL_CONFIG_SOURCE
mkdir -p /shm/root
@@ -164,7 +166,7 @@
/load_modules
# check to see if cdrom has already been mounted
-if [ ! -e /cdrom/boot/initrd.gz ] ; then
+if [ ! -e /cdrom/DEVIL-LINUX ] ; then
# find the CDROM
/mount_cdrom /cdrom
fi
@@ -196,7 +198,7 @@
fi
# unmount config media
-umount /floppy
+umount /floppy &> /dev/null
# Update modules for SCSI CD (if any)
if [ -s /shm/.probed_modules ] ; then
Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- mount_cdrom 14 Feb 2004 16:37:52 -0000 1.21
+++ mount_cdrom 15 Feb 2004 17:49:09 -0000 1.22
@@ -36,6 +36,7 @@
echo -e "Found on $disk"
$NORMAL
fi
+ echo $disk > /shm/DL_DEVICE
exit 0
else
umount $1
@@ -78,6 +79,7 @@
fi
if [ -e /mnt/bootcd.iso ] ; then
mount -o loop -t iso9660 /mnt/bootcd.iso $1 || return 1
+ echo $disk > /shm/DL_DEVICE
exit 0
fi
if [ "$3" != "silent" ]; then
|
