From 03486f5693441f0a13d36445e701e5195b396085 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 23 Jan 2017 18:49:27 +0000 Subject: [PATCH] integrate-distro.sh: Add support for config extra_boot_params.local_xxx Signed-off-by: Jan Lindemann --- scripts/integrate-distro.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh index 7a6aae86..60a4b5e3 100644 --- a/scripts/integrate-distro.sh +++ b/scripts/integrate-distro.sh @@ -1013,6 +1013,8 @@ make_boot_menu() die "failed to detect kernel version for creating boot menu" local disk=hd$run_grub_dev_num + local bootpar_default=`cfg_value extra_boot_params.local_default` + local bootpar_failsafe=`cfg_value extra_boot_params.local_failsafe` _cat << EOT |default 0 @@ -1022,25 +1024,24 @@ make_boot_menu() | |title Default | root ($disk,$grub_slash_boot_partition_num) - | kernel /vmlinuz root=$run_dev_root resume=$run_dev_swap splash=silent quiet showopts + | kernel /vmlinuz root=$run_dev_root resume=$run_dev_swap splash=silent quiet showopts $bootpar_default | initrd /initrd-local | |title Failsafe | root ($disk,$grub_slash_boot_partition_num) - | kernel /vmlinuz root=$run_dev_root showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe rdinitdebug rdshell + | kernel /vmlinuz root=$run_dev_root showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe rdinitdebug rdshell $bootpar_failsafe | initrd /initrd-local | |title Default $kernel_version | root ($disk,$grub_slash_boot_partition_num) - | kernel /vmlinuz-$kernel_version root=$run_dev_root resume=$run_dev_swap splash=silent quiet showopts + | kernel /vmlinuz-$kernel_version root=$run_dev_root resume=$run_dev_swap splash=silent quiet showopts $bootpar_default | initrd /initrd-local-$kernel_version | |title Failsafe $kernel_version | root ($disk,$grub_slash_boot_partition_num) - | kernel /vmlinuz-$kernel_version root=$run_dev_root showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe + | kernel /vmlinuz-$kernel_version root=$run_dev_root showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe $bootpar_failsafe | initrd /initrd-local-$kernel_version EOT - } make_etc_jcs_jcs_conf()