[Devil-linux-commit] build/scripts build-iso,1.63,1.64

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22540/scripts

Modified Files:
	build-iso 
Log Message:
- don't wait for usb-storage driver if no devices are present (Roland Pabel)
- added boot parameter 'config=<device>:<filename>' which is given
  priority in search for configuration archive (Roland Pabel)


Index: build-iso
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- build-iso	16 Mar 2004 15:07:24 -0000	1.63
+++ build-iso	9 Apr 2004 00:47:36 -0000	1.64
@@ -294,6 +294,7 @@
 		fi
 		echo "F1 /boot/f1.txt" >> $CDDIR/isolinux.cfg
 		echo "F2 /boot/f2.txt" >> $CDDIR/isolinux.cfg
+		echo "F3 /boot/f3.txt" >> $CDDIR/isolinux.cfg
 		echo "F10 /boot/message" >> $CDDIR/isolinux.cfg
 
 		# Help Overview - F1
@@ -301,18 +302,30 @@
 		echo -n -e "\01702Help Overview\r\n\r\n" >> $CDDIR/boot/f1.txt
 		echo -n -e "\01704KEY      TOPIC\r\n\r\n" >> $CDDIR/boot/f1.txt
 		echo -n -e "\0170fF1       This help screen\r\n" >> $CDDIR/boot/f1.txt
-		echo -n -e "\0170fF2       Boot Options\r\n" >> $CDDIR/boot/f1.txt
+		echo -n -e "\0170fF2       Common Boot Options\r\n" >> $CDDIR/boot/f1.txt
+		echo -n -e "\0170fF3       Devil-Linux Configuration Options\r\n" >> $CDDIR/boot/f1.txt
 		echo -n -e "\0170fF10      Return to standard screen\r\n\r\n" >> $CDDIR/boot/f1.txt
 
 		# Boot Options - F2
 		echo -n -e "\030/boot/logo.lss\n\r\n" > $CDDIR/boot/f2.txt		
-		echo -n -e "\01702Boot Options\r\n\r\n" >> $CDDIR/boot/f2.txt
+		echo -n -e "\01702Common Boot Options\r\n\r\n" >> $CDDIR/boot/f2.txt
 		echo -n -e "\0170f   Devil-Linux will boot with these default options:\r\n" >> $CDDIR/boot/f2.txt
 		echo -n -e "\01704     $BOOT_OPTIONS_DL\r\n" >> $CDDIR/boot/f2.txt
 		echo -n -e "\0170f   You can add your own options by appending them on the command line.\r\n" >> $CDDIR/boot/f2.txt
 		echo -n -e "\01704   Don't override any of the above options unless you know what you are doing!\r\n\r\n" >> $CDDIR/boot/f2.txt
 		echo -n -e "\0170f   For booting into Single-User mode append \"S\", e.g. \"$BOOT_OPTION_DEFAULT S\".\r\n\r\n" >> $CDDIR/boot/f2.txt
 		
+		# Configuration Options - F3
+		echo -n -e "\030/boot/logo.lss\n\r\n" > $CDDIR/boot/f3.txt		
+		echo -n -e "\01702Devil-Linux Configuration Options\r\n\r\n" >> $CDDIR/boot/f3.txt
+		echo -n -e "\0170f   Devil-Linux will search for a configuration archive called etc.tar.bz2 on\r\n" >> $CDDIR/boot/f3.txt
+		echo -n -e "\0170f   any IDE/SCSI/Floopy device accessible.\r\n" >> $CDDIR/boot/f3.txt
+		echo -n -e "\0170f   You can override this behavious by specifying this parameter:\r\n\r\n" >> $CDDIR/boot/f3.txt
+		echo -n -e "\01704   config=<device>:<filename>, i.e. config=/dev/floopy/0:backup.tar.bz2\r\n\r\n" >> $CDDIR/boot/f3.txt
+		echo -n -e "\0170f   You can omit either \01704device\0170f or \01704filename\0170f thus giving priority to a device or\r\n" >> $CDDIR/boot/f3.txt
+		echo -n -e "\0170f   a special file. Devil-Linux will try to make use of your desired config\r\n" >> $CDDIR/boot/f3.txt
+		echo -n -e "\0170f   first, but if it can't find your file, it will load the first one available.\r\n\r\n" >> $CDDIR/boot/f3.txt		
+		
 		# convert the logo into the syslinux format
 		ppmtolss16 < $DL_DIR/other/devil-linux.pnm >$CDDIR/boot/logo.lss || exit 1