[Devil-linux-commit] build/scripts build-iso,1.58,1.59

[<smi...@pr...>]

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

Modified Files:
	build-iso 
Log Message:
added selection of default screen resolution (by Roland Pabel)


Index: build-iso
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- build-iso	25 Jan 2004 15:45:02 -0000	1.58
+++ build-iso	1 Feb 2004 23:29:39 -0000	1.59
@@ -226,71 +226,72 @@
 		echo -n -e "\r\n\17" >> $CDDIR/boot/message
 #		echo -n -e "0fDevil-Linux Version $DL_VERSION_FULL is loading...\r\n\r\n" >> $CDDIR/boot/message
 		echo -n -e "0fPlease select a boot option:\r\n\r\n" >> $CDDIR/boot/message
-		echo -n -e "  0 - Standard 80x25 text mode  (default)\r\n" >> $CDDIR/boot/message
-		echo -n -e "  1 - 640x480  VESA Frame Buffer\r\n" >> $CDDIR/boot/message
-		echo -n -e "  2 - 800x600  VESA Frame Buffer\r\n" >> $CDDIR/boot/message
-		echo -n -e "  3 - 1024x768 VESA Frame Buffer\r\n" >> $CDDIR/boot/message
-		echo -n -e "  4 - Other\r\n\r\n" >> $CDDIR/boot/message
+		declare -a BOOT_OPTIONS_TEXT
+		declare -a BOOT_OPTIONS_MODE
+		declare -a BOOT_OPTIONS_KERNEL_MODE
+		BOOT_OPTIONS_TEXT=( "0 - Standard 80x25 text mode"
+				    "1 - 640x480  VESA Frame Buffer"
+				    "2 - 800x600  VESA Frame Buffer"
+				    "3 - 1024x768 VESA Frame Buffer"
+				    "4 - Other" )
+		BOOT_OPTIONS_MODE=( "80x25" "640x480" "800x600" "1024x768" "ask" )
+		BOOT_OPTIONS_KERNEL_MODE=( "NORMAL_VGA" "769" "771" "773" "ask" )
+		BOOT_OPTION_DEFAULT=0
+
+		i=0
+		while [ $i -lt ${#BOOT_OPTIONS_TEXT[@]} ]
+		do
+			echo -n -e "  ${BOOT_OPTIONS_TEXT[$i]}" >> $CDDIR/boot/message
+			if [ ${BOOT_OPTIONS_MODE[$i]} = $CONFIG_BOOT_OPTION_VGA ]; then
+			    BOOT_OPTION_DEFAULT=$i;
+			    echo -n -e " (default)" >> $CDDIR/boot/message
+			fi
+			echo -n -e "\r\n" >> $CDDIR/boot/message
+			let "i=$i+1"
+		done
+		echo -n -e "\r\n" >> $CDDIR/boot/message
+
 		[ -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
 
-		# convert the logo into the syslinux format
-		ppmtolss16 < $DL_DIR/other/devil-linux.pnm >$CDDIR/boot/logo.lss || exit 1
-
+		BOOT_OPTION_RAMDISK="";
 		if [ "$CONFIG_INITRD_FS" = "CRAMFS" ]; then
-			#original: DEFAULT /boot/vmlinuz root=/dev/ram1 initrd=/boot/initrd.gz ramdisk=$ISIZE
-			cat  > $CDDIR/isolinux.cfg  <<-EOF
-			default 0
-			display /boot/message
-			timeout 50
-			prompt 1
-			label 0
-			kernel /boot/vmlinuz
-			append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk_blocksize=4096
-			label 1
-			kernel /boot/vmlinuz
-			append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk_blocksize=4096 vga=769
-			label 2
-			kernel /boot/vmlinuz
-			append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk_blocksize=4096 vga=771
-			label 3
-			kernel /boot/vmlinuz
-			append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk_blocksize=4096 vga=773
-			label 4
-			kernel /boot/vmlinuz
-			append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk_blocksize=4096 vga=ask
-			EOF
+		    BOOT_OPTION_RAMDISK="ramdisk_blocksize=4096"
 		fi
 		if [ "$CONFIG_INITRD_FS" = "EXT2" ]; then
-			#original: DEFAULT /boot/vmlinuz root=/dev/ram1 initrd=/boot/initrd.gz ramdisk=$ISIZE
-			cat  > $CDDIR/isolinux.cfg  <<-EOF
-			default 0
-			display /boot/message
-			timeout 50
-			prompt 1
-			label 0
-			kernel /boot/vmlinuz
-			append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk=$ISIZE ro
-			label 1
-			kernel /boot/vmlinuz
-			append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk=$ISIZE ro vga=769
-			label 2
-			kernel /boot/vmlinuz
-			append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk=$ISIZE ro vga=771
-			label 3
-			kernel /boot/vmlinuz
-			append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk=$ISIZE ro vga=773
-			label 4
+		    BOOT_OPTION_RAMDISK="ro ramdisk_size=$ISIZE"
+		fi
+
+		#original: DEFAULT /boot/vmlinuz root=/dev/ram1 initrd=/boot/initrd.gz [ro ramdisk=$ISIZE][ramdisk_blocksize=4096]
+		cat  > $CDDIR/isolinux.cfg  <<-EOF
+		default $BOOT_OPTION_DEFAULT
+		display /boot/message
+		timeout 50
+		prompt 1
+		EOF
+		i=0
+		while [ $i -lt ${#BOOT_OPTIONS_MODE[@]} ]
+		do
+			cat  >> $CDDIR/isolinux.cfg  <<-EOF
+			label $i
 			kernel /boot/vmlinuz
-			append root=/dev/ram0 initrd=/boot/initrd.gz  init=/linuxrc ramdisk=$ISIZE ro vga=ask
+			append root=/dev/ram0 initrd=/boot/initrd.gz init=/linuxrc $BOOT_OPTION_RAMDISK vga=${BOOT_OPTIONS_KERNEL_MODE[$i]}
 			EOF
-		fi
+			let "i=$i+1"
+		done
+		unset BOOT_OPTIONS_TEXT
+		unset BOOT_OPTIONS_MODE
+		unset BOOT_OPTIONS_KERNEL_MODE
 
 		if [ -f $CDDIR/boot/memtest ]; then
 		    echo "label m" >> $CDDIR/isolinux.cfg
 		    echo "  kernel /boot/memtest" >> $CDDIR/isolinux.cfg
 		fi
 
+		# 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/