diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-09-30 09:20:15 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-09-30 09:20:15 +0200 |
| commit | a9bb5418c9b9a0b034cb527d3f3a7f3cb274a9de (patch) | |
| tree | 7b5688875656354aa319a9b40b64e0546f63b44e | |
| parent | b6934184597134270be8f09afb6edca1c45c57f7 (diff) | |
| download | vyos-live-build-a9bb5418c9b9a0b034cb527d3f3a7f3cb274a9de.tar.gz vyos-live-build-a9bb5418c9b9a0b034cb527d3f3a7f3cb274a9de.zip | |
Using initramfs generator specific boot parameters in syslinux configuration files.
| -rwxr-xr-x | functions/defaults.sh | 10 | ||||
| -rw-r--r-- | share/bootloaders/extlinux/live.cfg.in | 4 | ||||
| -rw-r--r-- | share/bootloaders/isolinux/live.cfg.in | 4 | ||||
| -rw-r--r-- | share/bootloaders/pxelinux/live.cfg.in | 4 | ||||
| -rw-r--r-- | share/bootloaders/syslinux/live.cfg.in | 4 |
5 files changed, 18 insertions, 8 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 8af9c8455..cc5c92d53 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -986,6 +986,16 @@ Set_defaults () LB_BOOTAPPEND_FAILSAFE="${LB_BOOTAPPEND_FAILSAFE:-memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}" # LB_BOOTAPPEND_LIVE + case "${LB_MODE}" in + ubuntu) + LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-boot=casper}" + ;; + + *) + LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-boot=live config}" + ;; + esac + if [ -n "${LB_DEBIAN_INSTALLER_PRESEEDFILE}" ] then case "${LB_BINARY_IMAGES}" in diff --git a/share/bootloaders/extlinux/live.cfg.in b/share/bootloaders/extlinux/live.cfg.in index 749dd2404..8dca4d50d 100644 --- a/share/bootloaders/extlinux/live.cfg.in +++ b/share/bootloaders/extlinux/live.cfg.in @@ -3,11 +3,11 @@ label live-@FLAVOUR@ menu default kernel @KERNEL@ initrd @INITRD@ - append boot=live config @LB_BOOTAPPEND_LIVE@ + append @LB_BOOTAPPEND_LIVE@ label live-@FLAVOUR@-failsafe menu label ^Live (@FLAVOUR@ failsafe) menu default kernel @KERNEL@ initrd @INITRD@ - append boot=live config @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@ + append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@ diff --git a/share/bootloaders/isolinux/live.cfg.in b/share/bootloaders/isolinux/live.cfg.in index 749dd2404..8dca4d50d 100644 --- a/share/bootloaders/isolinux/live.cfg.in +++ b/share/bootloaders/isolinux/live.cfg.in @@ -3,11 +3,11 @@ label live-@FLAVOUR@ menu default kernel @KERNEL@ initrd @INITRD@ - append boot=live config @LB_BOOTAPPEND_LIVE@ + append @LB_BOOTAPPEND_LIVE@ label live-@FLAVOUR@-failsafe menu label ^Live (@FLAVOUR@ failsafe) menu default kernel @KERNEL@ initrd @INITRD@ - append boot=live config @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@ + append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@ diff --git a/share/bootloaders/pxelinux/live.cfg.in b/share/bootloaders/pxelinux/live.cfg.in index 749dd2404..8dca4d50d 100644 --- a/share/bootloaders/pxelinux/live.cfg.in +++ b/share/bootloaders/pxelinux/live.cfg.in @@ -3,11 +3,11 @@ label live-@FLAVOUR@ menu default kernel @KERNEL@ initrd @INITRD@ - append boot=live config @LB_BOOTAPPEND_LIVE@ + append @LB_BOOTAPPEND_LIVE@ label live-@FLAVOUR@-failsafe menu label ^Live (@FLAVOUR@ failsafe) menu default kernel @KERNEL@ initrd @INITRD@ - append boot=live config @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@ + append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@ diff --git a/share/bootloaders/syslinux/live.cfg.in b/share/bootloaders/syslinux/live.cfg.in index 749dd2404..8dca4d50d 100644 --- a/share/bootloaders/syslinux/live.cfg.in +++ b/share/bootloaders/syslinux/live.cfg.in @@ -3,11 +3,11 @@ label live-@FLAVOUR@ menu default kernel @KERNEL@ initrd @INITRD@ - append boot=live config @LB_BOOTAPPEND_LIVE@ + append @LB_BOOTAPPEND_LIVE@ label live-@FLAVOUR@-failsafe menu label ^Live (@FLAVOUR@ failsafe) menu default kernel @KERNEL@ initrd @INITRD@ - append boot=live config @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@ + append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@ |