diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-05-29 21:15:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-29 21:15:58 +0200 |
| commit | cddef284e80803cd67345da895481bd0b2575526 (patch) | |
| tree | bc16f26c8857d257da0b2650b6d2063b2d8f9c1c | |
| parent | 2657f076b4bc0e5bc1b989cfb4cb8e8204ecc36c (diff) | |
| parent | e9d561ad537ebaa0d5eba5e6413ee1428141bf4a (diff) | |
| download | vyos-build-cddef284e80803cd67345da895481bd0b2575526.tar.gz vyos-build-cddef284e80803cd67345da895481bd0b2575526.zip | |
Merge pull request #47 from runborg/equuleus
| -rwxr-xr-x | data/live-build-config/hooks/live/10-unmountfs.chroot | 2 | ||||
| -rwxr-xr-x | data/live-build-config/hooks/live/24-efi_packages.chroot | 2 | ||||
| -rw-r--r-- | data/package-lists/vyos-x86.list.chroot | 2 | ||||
| -rwxr-xr-x | scripts/live-build-config | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/data/live-build-config/hooks/live/10-unmountfs.chroot b/data/live-build-config/hooks/live/10-unmountfs.chroot index 7992a4d2..05bcc12c 100755 --- a/data/live-build-config/hooks/live/10-unmountfs.chroot +++ b/data/live-build-config/hooks/live/10-unmountfs.chroot @@ -1,5 +1,5 @@ #!/bin/sh - +exit 0 # hack umountfs script to cleanly unmount live systems sed \ diff --git a/data/live-build-config/hooks/live/24-efi_packages.chroot b/data/live-build-config/hooks/live/24-efi_packages.chroot index c2b1ff11..49bc6ebb 100755 --- a/data/live-build-config/hooks/live/24-efi_packages.chroot +++ b/data/live-build-config/hooks/live/24-efi_packages.chroot @@ -1,5 +1,5 @@ #!/bin/sh - +exit 0 echo I: Download grub-efi packages. mkdir -p /usr/share/vyos/packages diff --git a/data/package-lists/vyos-x86.list.chroot b/data/package-lists/vyos-x86.list.chroot index 6f5d7624..e107534c 100644 --- a/data/package-lists/vyos-x86.list.chroot +++ b/data/package-lists/vyos-x86.list.chroot @@ -2,5 +2,3 @@ grub2 grub-pc qemu-guest-agent hyperv-daemons -vyos-xe-guest-utilities -vyos-netplug diff --git a/scripts/live-build-config b/scripts/live-build-config index 05a41bd4..7141df00 100755 --- a/scripts/live-build-config +++ b/scripts/live-build-config @@ -35,7 +35,7 @@ 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" \ + --bootappend-live "boot=live components hostname=vyos username=live nopersistence noautologin nonetworking union=overlay console=tty0 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" \ --linux-flavours {{kernel_flavor}} \ --linux-packages linux-image-{{kernel_version}} \ --bootloader syslinux,grub-efi \ |