Using short boot parameter 'config' to enable live-config, requires live-config 2...
authorDaniel Baumann <daniel@debian.org>
Thu, 16 Sep 2010 20:38:13 +0000 (22:38 +0200)
committerDaniel Baumann <daniel@debian.org>
Sun, 26 Sep 2010 13:03:18 +0000 (15:03 +0200)
scripts/build/lb_binary_grub
scripts/build/lb_binary_grub2
scripts/build/lb_binary_silo
scripts/build/lb_binary_syslinux
scripts/build/lb_binary_yaboot

index 802bfbe..efd16ea 100755 (executable)
@@ -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}"
 }
 
index 8610eee..591b5f1 100755 (executable)
@@ -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}"
 }
index acc62ff..7c0c6ae 100755 (executable)
@@ -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 ()
index c869f5f..9a96c5d 100755 (executable)
@@ -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 ()
index 44b0bde..1e7fa95 100755 (executable)
@@ -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"
 }