diff options
author | Daniel Baumann <daniel@debian.org> | 2010-05-16 18:53:09 +0200 |
---|---|---|
committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:08 +0100 |
commit | 73090fe9956085216cbf9b52ae9b9cfcc1a32ac3 (patch) | |
tree | 85c70f17b17d429eb974e20bd59d7577c1e589ac /helpers | |
parent | caaf28ec95c5bd76f49a1fbc2fe7e354c9287132 (diff) | |
download | vyos-live-build-73090fe9956085216cbf9b52ae9b9cfcc1a32ac3.tar.gz vyos-live-build-73090fe9956085216cbf9b52ae9b9cfcc1a32ac3.zip |
Updating default boot parameters to include live-config.
Diffstat (limited to 'helpers')
-rwxr-xr-x | helpers/binary_grub | 2 | ||||
-rwxr-xr-x | helpers/binary_grub2 | 2 | ||||
-rwxr-xr-x | helpers/binary_silo | 2 | ||||
-rwxr-xr-x | helpers/binary_syslinux | 4 | ||||
-rwxr-xr-x | helpers/binary_yaboot | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/helpers/binary_grub b/helpers/binary_grub index 2fd2a5a57..b4d21d1ac 100755 --- a/helpers/binary_grub +++ b/helpers/binary_grub @@ -67,7 +67,7 @@ Grub_live_entry () APPEND="${4}" LINUX_LIVE="${LINUX_LIVE}\ntitle\t\tDebian GNU/Linux - ${LABEL}" - LINUX_LIVE="${LINUX_LIVE}\nkernel\t\t/${KERNEL} boot=${INITFS} LH_BOOTAPPEND_LIVE ${APPEND}" + LINUX_LIVE="${LINUX_LIVE}\nkernel\t\t/${KERNEL} boot=${INITFS} live-config LH_BOOTAPPEND_LIVE ${APPEND}" LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}" } diff --git a/helpers/binary_grub2 b/helpers/binary_grub2 index 0d17214c9..dde12b013 100755 --- a/helpers/binary_grub2 +++ b/helpers/binary_grub2 @@ -67,7 +67,7 @@ Grub_live_entry () APPEND="${4}" LINUX_LIVE="${LINUX_LIVE}\nmenuentry \"Debian GNU/Linux - ${LABEL}\" {" - LINUX_LIVE="${LINUX_LIVE}\nlinux\t\t/${KERNEL} boot=${INITFS} LH_BOOTAPPEND_LIVE ${APPEND}" + LINUX_LIVE="${LINUX_LIVE}\nlinux\t\t/${KERNEL} boot=${INITFS} live-config LH_BOOTAPPEND_LIVE ${APPEND}" LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}" LINUX_LIVE="${LINUX_LIVE}\n}" } diff --git a/helpers/binary_silo b/helpers/binary_silo index 063944cf6..aca5afe0f 100755 --- a/helpers/binary_silo +++ b/helpers/binary_silo @@ -81,7 +81,7 @@ Silo_live_entry () LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n" LINUX_LIVE="${LINUX_LIVE}\t label=${LABEL}\n" LINUX_LIVE="${LINUX_LIVE}\t initrd=${DIRECTORY}/${INITRD}\n" - LINUX_LIVE="${LINUX_LIVE}\t append=\"boot=${INITFS} LH_BOOTAPPEND_LIVE ${APPEND}\"\n" + LINUX_LIVE="${LINUX_LIVE}\t append=\"boot=${INITFS} live-config LH_BOOTAPPEND_LIVE ${APPEND}\"\n" } Silo_install_entry () diff --git a/helpers/binary_syslinux b/helpers/binary_syslinux index e3a8f728c..116eaf404 100755 --- a/helpers/binary_syslinux +++ b/helpers/binary_syslinux @@ -126,7 +126,7 @@ Syslinux_live_entry () fi LINUX_LIVE="${LINUX_LIVE}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n" - LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} ${LH_BOOTAPPEND_LIVE} ${APPEND}\n" + LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} live-config ${LH_BOOTAPPEND_LIVE} ${APPEND}\n" # Failsafe kernel LINUX_LIVE="${LINUX_LIVE}\nlabel ${LABEL}failsafe\n" @@ -138,7 +138,7 @@ Syslinux_live_entry () fi LINUX_LIVE="${LINUX_LIVE}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n" - LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} ${LH_BOOTAPPEND_LIVE} ${APPEND} ${FAILSAFE}\n" + LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} live-config ${LH_BOOTAPPEND_LIVE} ${APPEND} ${FAILSAFE}\n" } Syslinux_install_entry () diff --git a/helpers/binary_yaboot b/helpers/binary_yaboot index 08269f382..2081391c5 100755 --- a/helpers/binary_yaboot +++ b/helpers/binary_yaboot @@ -71,7 +71,7 @@ Yaboot_live_entry () LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n" LINUX_LIVE="${LINUX_LIVE}\tlabel=${LABEL}\n" LINUX_LIVE="${LINUX_LIVE}\tinitrd=${DIRECTORY}/${INITRD}\n" - LINUX_LIVE="${LINUX_LIVE}\tappend=\"boot=${INITFS} LH_BOOTAPPEND_LIVE ${APPEND}\"\n" + LINUX_LIVE="${LINUX_LIVE}\tappend=\"boot=${INITFS} live-config LH_BOOTAPPEND_LIVE ${APPEND}\"\n" LINUX_LIVE="${LINUX_LIVE}\tinitrd-size=10240\n" } |