diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py index 6f1eb5bc..98f0eddd 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -24,6 +24,8 @@ class livecd_stage2(StageBase): "livecd/fsscript", "livecd/fstype", "livecd/gk_mainargs", + "livecd/grub_theme", + "livecd/grub_timeout", "livecd/iso", "livecd/iso_extra_partition", "livecd/linuxrc", diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt index 3a74ee1c..410ea5e2 100644 --- a/doc/catalyst-spec.5.txt +++ b/doc/catalyst-spec.5.txt @@ -204,6 +204,16 @@ if USE=system-bootloader is set. The cdtar is essentially the bootloader for the CD. It also holds the main configuration for the bootloader. +*livecd/grub_timeout*:: +This Option to set the GRUB menu timeout in seconds (i.e.'5'). +If unset, it defaults to `10` + +*livecd/grub_theme*:: +This option sets the theme path inside the ISO, to a GRUB `theme.txt` used +by the generated ISO bootloader configuration (i.e. +`/boot/grub/themes/mytheme/theme.txt`). If unset, it defaults to +`/boot/grub/themes/gentoo_frosted/theme.txt`. + Kernel and boot issues ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/targets/support/iso-bootloader-setup.sh b/targets/support/iso-bootloader-setup.sh index 70e9afd6..74458215 100755 --- a/targets/support/iso-bootloader-setup.sh +++ b/targets/support/iso-bootloader-setup.sh @@ -111,13 +111,13 @@ case ${clst_hostarch} in mkdir -p $1/boot/grub echo 'set default=0' > ${iacfg} echo 'set gfxpayload=keep' >> ${iacfg} - echo 'set timeout=10' >> ${iacfg} + echo "set timeout=${clst_livecd_grub_timeout:-10}" >> ${iacfg} echo 'insmod all_video' >> ${iacfg} echo 'insmod png' >> ${iacfg} echo 'insmod gfxterm' >> ${iacfg} echo 'terminal_output gfxterm' >> ${iacfg} echo 'set gfxmode=auto' >> ${iacfg} - echo 'set theme=/boot/grub/themes/gentoo_frosted/theme.txt' >> ${iacfg} + echo "set theme=${clst_livecd_grub_theme:-/boot/grub/themes/gentoo_frosted/theme.txt}" >> ${iacfg} echo '' >> ${iacfg} for x in ${clst_boot_kernel} do