Add a KERNEL_PARAMS variable that can be used to pass things like debconf
priority. No need to hardcode the debian-edu priority now.
This commit is contained in:
parent
9033c4b6bf
commit
60808fc119
4
CONF.sh
4
CONF.sh
|
@ -261,3 +261,7 @@ export PUBLISH_PATH="/home/jigdo-area/"
|
|||
# INSTALLER_CD=1: just add debian-installer (use TASK=tasks/debian-installer)
|
||||
# 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"
|
||||
|
|
|
@ -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 DEBCONF_PRIORITY=critical
|
||||
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
|
||||
|
|
Loading…
Reference in New Issue