merge KERNEL_PARAMS support from debian-edu branch

CONF.sh

@@ -263,5 +263,9 @@ export PUBLISH_PATH="/home/jigdo-area/"
 # INSTALLER_CD=2: add d-i and base (use TASK=tasks/debian-installer+kernel)
 #export INSTALLER_CD=0
 
+# Parameters to pass to kernel when the CD boots. Not currently supported
+# for all architectures.
+#export KERNEL_PARAMS="DEBCONF_PRIORITY=critical"
+
 # If set, limits the number of binary CDs to produce.
 #MAXCDS=1

debian/changelog

@@ -27,6 +27,9 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
       of hw-detect.
     - Add tools/get_diskusage.pl (originally by Petter).
     - Add update-popcon Makefile target (taken from Skolelinux).
+    - Add a KERNEL_PARAMS variable, which can be used to add kernel parameters
+      and is useful for creating things like CDs that install in critical
+      priority mode. I only implemented it for i386 so far.
     - Add MAXCDS config variable, which forces debian-cd to stop after a given
       number of binary CDs.
   * Petter Reinholdtsen

tools/boot/sarge/boot-i386

@@ -121,22 +121,21 @@ if [ -e boot$N/isolinux/f3.txt.with26 ];then
   done
   cp -a cdrom/2.6 $CDDIR/install/2.6
 # Isolinux config file.
-cat > boot$N/isolinux/isolinux.cfg <<EOF
-DEFAULT /install/vmlinuz
-APPEND vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
+sed s/\$KERNEL_PARAMS/$KERNEL_PARAMS/g' > boot$N/isolinux/isolinux.cfg <<EOF
+DEFAULT /install/vmlinuz APPEND $KERNEL_PARAMS vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
 LABEL linux
   kernel /install/vmlinuz
 LABEL cdrom
   kernel /install/vmlinuz
 LABEL linux26
   kernel /install/2.6/vmlinuz
-APPEND vga=normal initrd=/install/2.6/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
+APPEND $KERNEL_PARAMS vga=normal initrd=/install/2.6/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
 LABEL expert
   kernel /install/vmlinuz
-  append DEBCONF_PRIORITY=low vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
+  append $KERNEL_PARAMS DEBCONF_PRIORITY=low vga=normal initrd=/install/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
 LABEL expert26
   kernel /install/2.6/vmlinuz
-  append DEBCONF_PRIORITY=low vga=normal initrd=/install/2.6/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
+  append $KERNEL_PARAMS DEBCONF_PRIORITY=low vga=normal initrd=/install/2.6/initrd.gz ramdisk_size=10240 root=/dev/rd/0 init=/linuxrc devfs=mount,dall rw
 DISPLAY isolinux.txt
 TIMEOUT 0
 PROMPT 1