diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-09-02 15:03:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-02 15:03:23 +0200 |
| commit | 663ef997c5b7b612e6e116661834a204199796eb (patch) | |
| tree | 4a6b299c8b12e01b05ed18b1d036d4abc564b45c /scripts/build-vyos-image | |
| parent | 93a3652a1c7663b29b568e733cca0d186fdc4ddf (diff) | |
| parent | e472fcbf319c325bbdabd75dd02c7693baaf5b7f (diff) | |
| download | vyos-build-663ef997c5b7b612e6e116661834a204199796eb.tar.gz vyos-build-663ef997c5b7b612e6e116661834a204199796eb.zip | |
Merge pull request #391 from Apachez-/T5538
T5538: Change order within variable lb_config_tmpl to fit order of manpage and fix some typos
Diffstat (limited to 'scripts/build-vyos-image')
| -rwxr-xr-x | scripts/build-vyos-image | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/scripts/build-vyos-image b/scripts/build-vyos-image index 5d07afca..0e6c89a7 100755 --- a/scripts/build-vyos-image +++ b/scripts/build-vyos-image @@ -420,35 +420,35 @@ if __name__ == "__main__": ## Configure live-build lb_config_tmpl = jinja2.Template(""" lb config noauto \ - --architectures {{architecture}} \ + --apt-indices false \ + --apt-options "--yes -oAPT::Get::allow-downgrades=true" \ + --apt-recommends false \ + --architecture {{architecture}} \ + --archive-areas {{debian_archive_areas}} \ + --backports true \ + --binary-image iso-hybrid \ --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 {{bootloaders}} \ - --binary-images iso-hybrid \ + --bootloaders {{bootloaders}} \ --checksums 'sha256 md5' \ --chroot-squashfs-compression-type {{squashfs_compression_type}} \ --debian-installer none \ + --debootstrap-options "--variant=minbase --exclude=isc-dhcp-client,isc-dhcp-common,ifupdown --include=apt-utils,ca-certificates,gnupg2" \ --distribution {{debian_distribution}} \ + --firmware-binary false \ + --firmware-chroot false \ --iso-application "VyOS" \ --iso-publisher "{{build_by}}" \ --iso-volume "VyOS" \ - --debootstrap-options "--variant=minbase --exclude=isc-dhcp-client,isc-dhcp-common,ifupdown --include=apt-utils,ca-certificates,gnupg2" \ + --linux-flavours {{kernel_flavor}} \ + --linux-packages linux-image-{{kernel_version}} \ + --mirror-binary {{debian_mirror}} \ + --mirror-binary-security {{debian_security_mirror}} \ --mirror-bootstrap {{debian_mirror}} \ --mirror-chroot {{debian_mirror}} \ --mirror-chroot-security {{debian_security_mirror}} \ - --mirror-binary {{debian_mirror}} \ - --mirror-binary-security {{debian_security_mirror}} \ - --archive-areas {{debian_archive_areas}} \ - --firmware-chroot false \ - --firmware-binary false \ - --updates true \ --security true \ - --backports true \ - --apt-recommends false \ - --apt-options "--yes -oAPT::Get::allow-downgrades=true" \ - --apt-indices false + --updates true "${@}" """) |