diff options
author | Daniel Baumann <daniel@debian.org> | 2010-09-16 22:38:13 +0200 |
---|---|---|
committer | Daniel Baumann <daniel@debian.org> | 2010-09-16 22:38:13 +0200 |
commit | 1b865f62a69456c8d60fd7d68bfb5d2c4cca703f (patch) | |
tree | d212a061e8ffe0566f455b82c3d497d2b0124a9f | |
parent | 43666a8c5022abf7e14df5d036249a321e8b3e32 (diff) | |
download | vyos-live-build-1b865f62a69456c8d60fd7d68bfb5d2c4cca703f.tar.gz vyos-live-build-1b865f62a69456c8d60fd7d68bfb5d2c4cca703f.zip |
Using short boot parameter 'config' to enable live-config, requires live-config 2.0.7.
-rwxr-xr-x | scripts/build/lb_binary_grub | 2 | ||||
-rwxr-xr-x | scripts/build/lb_binary_grub2 | 2 | ||||
-rwxr-xr-x | scripts/build/lb_binary_silo | 2 | ||||
-rwxr-xr-x | scripts/build/lb_binary_syslinux | 4 | ||||
-rwxr-xr-x | scripts/build/lb_binary_yaboot | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/scripts/build/lb_binary_grub b/scripts/build/lb_binary_grub index 802bfbef4..efd16ea80 100755 --- a/scripts/build/lb_binary_grub +++ b/scripts/build/lb_binary_grub @@ -68,7 +68,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} live-config LB_BOOTAPPEND_LIVE ${APPEND}" + LINUX_LIVE="${LINUX_LIVE}\nkernel\t\t/${KERNEL} boot=${INITFS} config LB_BOOTAPPEND_LIVE ${APPEND}" LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}" } diff --git a/scripts/build/lb_binary_grub2 b/scripts/build/lb_binary_grub2 index 8610eee37..591b5f112 100755 --- a/scripts/build/lb_binary_grub2 +++ b/scripts/build/lb_binary_grub2 @@ -68,7 +68,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} live-config LB_BOOTAPPEND_LIVE ${APPEND}" + LINUX_LIVE="${LINUX_LIVE}\nlinux\t\t/${KERNEL} boot=${INITFS} config LB_BOOTAPPEND_LIVE ${APPEND}" LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}" LINUX_LIVE="${LINUX_LIVE}\n}" } diff --git a/scripts/build/lb_binary_silo b/scripts/build/lb_binary_silo index acc62ffbd..7c0c6aea7 100755 --- a/scripts/build/lb_binary_silo +++ b/scripts/build/lb_binary_silo @@ -82,7 +82,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} live-config LB_BOOTAPPEND_LIVE ${APPEND}\"\n" + LINUX_LIVE="${LINUX_LIVE}\t append=\"boot=${INITFS} config LB_BOOTAPPEND_LIVE ${APPEND}\"\n" } Silo_install_entry () diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux index c869f5fb8..9a96c5df1 100755 --- a/scripts/build/lb_binary_syslinux +++ b/scripts/build/lb_binary_syslinux @@ -129,7 +129,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} live-config ${LB_BOOTAPPEND_LIVE} ${APPEND} ${QAPPEND}\n" + LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} config ${LB_BOOTAPPEND_LIVE} ${APPEND} ${QAPPEND}\n" # Failsafe kernel LINUX_LIVE="${LINUX_LIVE}\nlabel ${LABEL}failsafe\n" @@ -141,7 +141,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} live-config ${LB_BOOTAPPEND_LIVE} ${APPEND} ${FAILSAFE}\n" + LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} config ${LB_BOOTAPPEND_LIVE} ${APPEND} ${FAILSAFE}\n" } Syslinux_install_entry () diff --git a/scripts/build/lb_binary_yaboot b/scripts/build/lb_binary_yaboot index 44b0bde97..1e7fa9522 100755 --- a/scripts/build/lb_binary_yaboot +++ b/scripts/build/lb_binary_yaboot @@ -72,7 +72,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} live-config LB_BOOTAPPEND_LIVE ${APPEND}\"\n" + LINUX_LIVE="${LINUX_LIVE}\tappend=\"boot=${INITFS} config LB_BOOTAPPEND_LIVE ${APPEND}\"\n" LINUX_LIVE="${LINUX_LIVE}\tinitrd-size=10240\n" } |