janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-24 14:50:38 +01:00
Code Activity

integrate-distro.sh: Add support for config extra_boot_params.local_xxx

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-01-23 18:49:27 +00:00
commit 03486f5693
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
scripts/integrate-distro.sh
View file

@ -1013,6 +1013,8 @@ make_boot_menu()
die "failed to detect kernel version for creating boot menu" die "failed to detect kernel version for creating boot menu"
local disk=hd$run_grub_dev_num 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 _cat << EOT
|default 0 |default 0
@ -1022,25 +1024,24 @@ make_boot_menu()
| |
|title Default |title Default
| root ($disk,$grub_slash_boot_partition_num) | 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 | initrd /initrd-local
| |
|title Failsafe |title Failsafe
| root ($disk,$grub_slash_boot_partition_num) | 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 | initrd /initrd-local
| |
|title Default $kernel_version |title Default $kernel_version
| root ($disk,$grub_slash_boot_partition_num) | 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 | initrd /initrd-local-$kernel_version
| |
|title Failsafe $kernel_version |title Failsafe $kernel_version
| root ($disk,$grub_slash_boot_partition_num) | 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 | initrd /initrd-local-$kernel_version
EOT EOT
} }
make_etc_jcs_jcs_conf() make_etc_jcs_jcs_conf()