diff options
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 12 | ||||
| -rwxr-xr-x | functions/losetup.sh | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index c48955104..b1e30e5e9 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -595,6 +595,15 @@ Set_defaults () case "${LB_INITRAMFS}" in live-boot) LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-boot=live components quiet splash}" + LB_BOOTAPPEND_VYOS_CONSOLE_1="${LB_BOOTAPPEND_VYOS_CONSOLE_1:-none}" + LB_BOOTAPPEND_VYOS_CONSOLE_2="${LB_BOOTAPPEND_VYOS_CONSOLE_2:-none}" + LB_BOOTAPPEND_VYOS_CONSOLE_3="${LB_BOOTAPPEND_VYOS_CONSOLE_3:-none}" + LB_BOOTAPPEND_VYOS_PW_CONSOLE_1="${LB_BOOTAPPEND_VYOS_PW_CONSOLE_1:-none}" + LB_BOOTAPPEND_VYOS_PW_CONSOLE_2="${LB_BOOTAPPEND_VYOS_PW_CONSOLE_2:-none}" + LB_BOOTAPPEND_VYOS_PW_CONSOLE_3="${LB_BOOTAPPEND_VYOS_PW_CONSOLE_3:-none}" + LB_VYOS_CONSOLE_1="${LB_VYOS_CONSOLE_1:-none}" + LB_VYOS_CONSOLE_2="${LB_VYOS_CONSOLE_2:-none}" + LB_VYOS_CONSOLE_3="${LB_VYOS_CONSOLE_3:-none}" LB_BOOTAPPEND_LIVE_FAILSAFE="${LB_BOOTAPPEND_LIVE_FAILSAFE:-boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}" ;; @@ -870,4 +879,7 @@ Check_defaults () # Ports using foreign bootstrap need a working qemu-*-system. This is the location it LB_BOOTSTRAP_QEMU_STATIC="${LB_BOOTSTRAP_QEMU_STATIC:-}" + LB_VYOS_VERSION="${LB_VYOS_VERSION:-live}" + LB_VYOS_PERSISTENCE="${LB_VYOS_PERSISTENCE:-false}" + } diff --git a/functions/losetup.sh b/functions/losetup.sh index 8cacfcf82..d2791b365 100755 --- a/functions/losetup.sh +++ b/functions/losetup.sh @@ -31,7 +31,7 @@ Lodetach () sync sleep 1 - if [ "${LB_IMAGE_TYPE}" = "hdd" ]; + if [ "${LIVE_IMAGE_TYPE}" = "hdd" ]; then case "${LB_BUILD_WITH_CHROOT}" in true) @@ -79,7 +79,7 @@ Losetup () LOOPDEVICE="$(echo ${DEVICE}p${PARTITION})" - if [ "${LB_IMAGE_TYPE}" = "hdd" ] + if [ "${LIVE_IMAGE_TYPE}" = "hdd" ] then losetup --partscan "${DEVICE}" "${FILE}" case "${LB_BUILD_WITH_CHROOT}" in |