From: <smi...@us...> - 2004-03-07 22:29:40
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16518/scripts Modified Files: build-iso super-freeswan Log Message: add command line boot options for isolinux (Roland Pabel) Index: build-iso =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- build-iso 14 Feb 2004 14:20:10 -0000 1.60 +++ build-iso 7 Mar 2004 22:05:47 -0000 1.61 @@ -253,6 +253,7 @@ [ -f $CDDIR/boot/memtest ] && echo -n -e " m - MEMTEST86\r\n\r\n" >> $CDDIR/boot/message echo -n -e "(timeout in 5 seconds)\r\n\r\n" >> $CDDIR/boot/message + echo -n -e "Press F1 for help\r\n\r\n" >> $CDDIR/boot/message BOOT_OPTION_RAMDISK=""; if [ "$CONFIG_INITRD_FS" = "CRAMFS" ]; then @@ -263,6 +264,7 @@ fi #original: DEFAULT /boot/vmlinuz root=/dev/ram1 initrd=/boot/initrd.gz [ro ramdisk=$ISIZE][ramdisk_blocksize=4096] + BOOT_OPTIONS_DL="root=/dev/ram0 initrd=/boot/initrd.gz init=/linuxrc $BOOT_OPTION_RAMDISK" cat > $CDDIR/isolinux.cfg <<-EOF default $BOOT_OPTION_DEFAULT display /boot/message @@ -270,12 +272,12 @@ prompt 1 EOF i=0 - while [ $i -lt ${#BOOT_OPTIONS_MODE[@]} ] + while [ $i -lt ${#BOOT_OPTIONS_KERNEL_MODE[@]} ] do cat >> $CDDIR/isolinux.cfg <<-EOF label $i kernel /boot/vmlinuz - append root=/dev/ram0 initrd=/boot/initrd.gz init=/linuxrc $BOOT_OPTION_RAMDISK vga=${BOOT_OPTIONS_KERNEL_MODE[$i]} + append $BOOT_OPTIONS_DL vga=${BOOT_OPTIONS_KERNEL_MODE[$i]} EOF let "i=$i+1" done @@ -287,11 +289,30 @@ echo "label m" >> $CDDIR/isolinux.cfg echo " kernel /boot/memtest" >> $CDDIR/isolinux.cfg fi + echo "F1 /boot/f1.txt" >> $CDDIR/isolinux.cfg + echo "F2 /boot/f2.txt" >> $CDDIR/isolinux.cfg + echo "F10 /boot/message" >> $CDDIR/isolinux.cfg + # Help Overview - F1 + echo -n -e "\030/boot/logo.lss\n\r\n" > $CDDIR/boot/f1.txt + 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 "\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 "\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 + # convert the logo into the syslinux format ppmtolss16 < $DL_DIR/other/devil-linux.pnm >$CDDIR/boot/logo.lss || exit 1 - # copy Kernel to CD Tree, to provide support for LOADLIN cp $BOOTIMAGEDIR/vmlinuz $CDDIR/boot/ cp $BOOTIMAGEDIR/initrd.gz $CDDIR/boot/ Index: super-freeswan =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/super-freeswan,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- super-freeswan 17 Jan 2004 14:46:04 -0000 1.6 +++ super-freeswan 7 Mar 2004 22:05:47 -0000 1.7 @@ -30,7 +30,7 @@ if [ "$CONFIG_SUPER_FREESWAN" = "y" ]; then # update kernel config if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then - DIRS=$(ls klips/net/ipsec/alg/Config.*.in) + DIRS=$(ls klips/net/ipsec/alg/Config*) DIRS="klips/net/ipsec/Config.in klips/net/ipsec/alg/Config.in $DIRS" for DIR in $DIRS do |