Update of /cvsroot/devil-linux/build/config/etc/initrd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7605
Modified Files:
Tag: rel-1-2-patches
linuxrc
Log Message:
- added possibility to load DL without configuration media
Index: linuxrc
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/linuxrc,v
retrieving revision 1.70.2.4
retrieving revision 1.70.2.5
diff -u -d -r1.70.2.4 -r1.70.2.5
--- linuxrc 6 Nov 2005 21:28:58 -0000 1.70.2.4
+++ linuxrc 10 Apr 2006 12:54:17 -0000 1.70.2.5
@@ -233,7 +233,7 @@
if [ ! "${CFG_SRC##/*/}" = "cd" ];then
beep;
$YELLOW
- echo -e "\n*** Found empty configuration media. ***"
+ echo -e "\n*** Found empty configuration media - $CFG_SRC. ***"
$NORMAL
echo -n "Should I copy default configuration to it?"
if ask_yes_no ; then
@@ -261,9 +261,18 @@
beep; sleep 1; beep; sleep 1; beep;
$RED
- echo -e "Please insert Configuration Media and press 'ENTER'"
+ echo -e "Would you really like to load DL without Configuration Media?"
$NORMAL
- read ANS
+ if ask_yes_no ; then
+ REALLY_LIVE=1
+ DL_CONFIG_SOURCE=/dev/null
+ DL_CONFIG_FILE="etc.tar.bz2"
+ export REALLY_LIVE
+ continue 2
+ else
+ echo -e "Please insert Configuration Media and press 'ENTER'"
+ read ANS
+ fi
echo
done
unset ANS RET
@@ -287,7 +296,16 @@
fi
echo "loading configuration"
-tar -C /shm -xjf /floppy/$DL_CONFIG_FILE
+if [ "$REALLY_LIVE" = "1" ] ; then
+ # check to see if cdrom has already been mounted
+ if [ ! -e /cdrom/DEVIL-LINUX ] ; then
+ # find the CDROM
+ /mount_cdrom /cdrom
+ fi
+ tar -C /shm -xjf /cdrom/config/etc.tar.bz2
+else
+ tar -C /shm -xjf /floppy/$DL_CONFIG_FILE
+fi
# create mtab for mount
cat /proc/mounts > /etc/mtab
@@ -331,7 +349,9 @@
fi
# unmount config media
-umount /floppy
+if [ "$REALLY_LIVE" != "1" ] ; then
+ umount /floppy
+fi
# Update modules for SCSI CD (if any)
if [ -s /shm/.probed_modules ] ; then
|
