diff options
| author | Runar Borge <runar@borge.nu> | 2019-07-22 21:54:20 +0200 |
|---|---|---|
| committer | Runar Borge <runar@borge.nu> | 2019-07-22 21:54:20 +0200 |
| commit | 6056acfa06c2b79ee8981b9f36a1ced2dac29111 (patch) | |
| tree | 613944f1de089105950a86501507b6aa2151380d /scripts/live-build-config | |
| parent | b229f0bd958a42c6faa345c91500c2ed8ccdc919 (diff) | |
| parent | 8c22ceead487b745d6b7c058c4d1c0a0eaa051c8 (diff) | |
| download | vyos-build-6056acfa06c2b79ee8981b9f36a1ced2dac29111.tar.gz vyos-build-6056acfa06c2b79ee8981b9f36a1ced2dac29111.zip | |
Merge remote-tracking branch 'origin/current' into equuleus
fixed merge errors in:
* scripts/live-build-config
- kernel parameters
* scripts/build-packages
- fixed list of packages to compile
Diffstat (limited to 'scripts/live-build-config')
| -rwxr-xr-x | scripts/live-build-config | 3 |
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 \ |