manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Making failsafe boot parameters fully customizable like the normal ones.

This commit is contained in:
Daniel Baumann 2012-10-04 14:24:36 +02:00 committed by Daniel Baumann
parent 5e1b463cf6
commit 56e4085c60
6 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
functions/defaults.sh
View File

@ -990,8 +990,6 @@ Set_defaults ()
fi fi
# Setting boot parameters # Setting boot parameters
LB_BOOTAPPEND_FAILSAFE="${LB_BOOTAPPEND_FAILSAFE:-memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}"
# LB_BOOTAPPEND_LIVE # LB_BOOTAPPEND_LIVE
case "${LB_MODE}" in case "${LB_MODE}" in
ubuntu) ubuntu)
@ -1003,6 +1001,17 @@ Set_defaults ()
;; ;;
esac esac
# LB_BOOTAPPEND_LIVE_FAILSAFE
case "${LB_MODE}" in
ubuntu)
LB_BOOTAPPEND_FAILSAFE="${LB_BOOTAPPEND_FAILSAFE:-boot=casper memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}"
;;
*)
LB_BOOTAPPEND_FAILSAFE="${LB_BOOTAPPEND_FAILSAFE:-boot=live config memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}"
;;
esac
if [ -n "${LB_DEBIAN_INSTALLER_PRESEEDFILE}" ] if [ -n "${LB_DEBIAN_INSTALLER_PRESEEDFILE}" ]
then then
case "${LB_BINARY_IMAGES}" in case "${LB_BINARY_IMAGES}" in

6
scripts/build/binary_syslinux
View File

@ -222,7 +222,7 @@ then
-e "s|@LINUX@|/live/vmlinuz|g" \ -e "s|@LINUX@|/live/vmlinuz|g" \
-e "s|@INITRD@|/live/initrd.img|g" \ -e "s|@INITRD@|/live/initrd.img|g" \
-e "s|@APPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \ -e "s|@APPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
-e "s|@APPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \ -e "s|@APPEND_LIVE_FAILSAFE@|${LB_BOOTAPPEND_LIVE_FAILSAFE}|g" \
"${_TARGET}/live.cfg.in" >> "${_TARGET}/live.cfg" "${_TARGET}/live.cfg.in" >> "${_TARGET}/live.cfg"
rm -f "${_TARGET}/live.cfg.in" rm -f "${_TARGET}/live.cfg.in"
@ -250,7 +250,7 @@ then
-e "s|@LINUX@|/live/vmlinuz${_NUMBER}|g" \ -e "s|@LINUX@|/live/vmlinuz${_NUMBER}|g" \
-e "s|@INITRD@|/live/initrd${_NUMBER}.img|g" \ -e "s|@INITRD@|/live/initrd${_NUMBER}.img|g" \
-e "s|@APPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \ -e "s|@APPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
-e "s|@APPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \ -e "s|@APPEND_LIVE_FAILSAFE@|${LB_BOOTAPPEND_LIVE_FAILSAFE}|g" \
"${_TARGET}/live.cfg" "${_TARGET}/live.cfg"
done done
@ -260,7 +260,7 @@ then
elif [ -e "${_TARGET}/live.cfg" ] elif [ -e "${_TARGET}/live.cfg" ]
then then
sed -i -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \ sed -i -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
-e "s|@LB_BOOTAPPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \ -e "s|@LB_BOOTAPPEND_LIVE_FAILSAFE@|${LB_BOOTAPPEND_LIVE_FAILSAFE}|g" \
${_TARGET}/live.cfg ${_TARGET}/live.cfg
fi fi

2
share/bootloaders/extlinux/live.cfg.in
View File

@ -9,4 +9,4 @@ label live-@FLAVOUR@-failsafe
menu label ^Live (@FLAVOUR@ failsafe) menu label ^Live (@FLAVOUR@ failsafe)
linux @LINUX@ linux @LINUX@
initrd @INITRD@ initrd @INITRD@
append @APPEND_LIVE@ @APPEND_FAILSAFE@ append @APPEND_LIVE_FAILSAFE@

2
share/bootloaders/isolinux/live.cfg.in
View File

@ -9,4 +9,4 @@ label live-@FLAVOUR@-failsafe
menu label ^Live (@FLAVOUR@ failsafe) menu label ^Live (@FLAVOUR@ failsafe)
linux @LINUX@ linux @LINUX@
initrd @INITRD@ initrd @INITRD@
append @APPEND_LIVE@ @APPEND_FAILSAFE@ append @APPEND_LIVE_FAILSAFE@

2
share/bootloaders/pxelinux/live.cfg.in
View File

@ -9,4 +9,4 @@ label live-@FLAVOUR@-failsafe
menu label ^Live (@FLAVOUR@ failsafe) menu label ^Live (@FLAVOUR@ failsafe)
linux @LINUX@ linux @LINUX@
initrd @INITRD@ initrd @INITRD@
append @APPEND_LIVE@ @APPEND_FAILSAFE@ append @APPEND_LIVE_FAILSAFE@

2
share/bootloaders/syslinux/live.cfg.in
View File

@ -9,4 +9,4 @@ label live-@FLAVOUR@-failsafe
menu label ^Live (@FLAVOUR@ failsafe) menu label ^Live (@FLAVOUR@ failsafe)
linux @LINUX@ linux @LINUX@
initrd @INITRD@ initrd @INITRD@
append @APPEND_LIVE@ @APPEND_FAILSAFE@ append @APPEND_LIVE_FAILSAFE@