summaryrefslogtreecommitdiff
path: root/scripts/live-build-config
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2019-07-23 17:07:34 +0700
committerGitHub <noreply@github.com>2019-07-23 17:07:34 +0700
commitd11d4b6e44b6db649b2402500c955af5f8d310c6 (patch)
tree613944f1de089105950a86501507b6aa2151380d /scripts/live-build-config
parentb229f0bd958a42c6faa345c91500c2ed8ccdc919 (diff)
parent6056acfa06c2b79ee8981b9f36a1ced2dac29111 (diff)
downloadvyos-build-d11d4b6e44b6db649b2402500c955af5f8d310c6.tar.gz
vyos-build-d11d4b6e44b6db649b2402500c955af5f8d310c6.zip
Merge pull request #57 from runborg/equuleus-merged
Sync equuleus with current.
Diffstat (limited to 'scripts/live-build-config')
-rwxr-xr-xscripts/live-build-config3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/live-build-config b/scripts/live-build-config
index 7141df00..9855467d 100755
--- a/scripts/live-build-config
+++ b/scripts/live-build-config
@@ -35,7 +35,8 @@ util.check_build_config()
lb_config_tmpl = """
lb config noauto \
--architectures {{architecture}} \
- --bootappend-live "boot=live components hostname=vyos username=live nopersistence noautologin nonetworking union=overlay console=tty0 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" \
+ --bootappend-live "boot=live components hostname=vyos username=live nopersistence noautologin nonetworking union=overlay console=ttyS0,115200 console=tty0 net.ifnames=0 biosdevname=0" \
+ --bootappend-live-failsafe "live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal console=ttyS0,115200 console=tty0 net.ifnames=0 biosdevname=0" \
--linux-flavours {{kernel_flavor}} \
--linux-packages linux-image-{{kernel_version}} \
--bootloader syslinux,grub-efi \