Merge pull request #948 from dmbaturin/T7372-quote-lb-config-arguments

build: T7372: correctly quote lb_config arguments
This commit is contained in:
Christian Breunig 2025-04-20 16:54:54 +02:00 committed by GitHub
commit d401c8fee1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 13 deletions

View File

@ -7,7 +7,7 @@ debian_distribution = "bookworm"
debian_mirror = "http://deb.debian.org/debian" debian_mirror = "http://deb.debian.org/debian"
debian_security_mirror = "http://deb.debian.org/debian-security" debian_security_mirror = "http://deb.debian.org/debian-security"
debian_archive_areas = "main,contrib,non-free,non-free-firmware" debian_archive_areas = "main contrib non-free non-free-firmware"
vyos_mirror = "https://packages.vyos.net/repositories/current" vyos_mirror = "https://packages.vyos.net/repositories/current"

View File

@ -620,30 +620,30 @@ DOCUMENTATION_URL="{build_config['documentation_url']}"
--apt-indices false \ --apt-indices false \
--apt-options "--yes -oAPT::Get::allow-downgrades=true" \ --apt-options "--yes -oAPT::Get::allow-downgrades=true" \
--apt-recommends false \ --apt-recommends false \
--architecture {{architecture}} \ --architecture "{{architecture}}" \
--archive-areas {{debian_archive_areas}} \ --archive-areas "{{debian_archive_areas}}" \
--backports true \ --backports true \
--binary-image iso-hybrid \ --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 "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" \ --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" \
--bootloaders {{bootloaders}} \ --bootloaders "{{bootloaders}}" \
--checksums 'sha256 md5' \ --checksums "sha256 md5" \
--chroot-squashfs-compression-type "{{squashfs_compression_type}}" \ --chroot-squashfs-compression-type "{{squashfs_compression_type}}" \
--debian-installer none \ --debian-installer none \
--debootstrap-options "--variant=minbase --exclude=isc-dhcp-client,isc-dhcp-common,ifupdown --include=apt-utils,ca-certificates,gnupg2,linux-kbuild-6.1" \ --debootstrap-options "--variant=minbase --exclude=isc-dhcp-client,isc-dhcp-common,ifupdown --include=apt-utils,ca-certificates,gnupg2,linux-kbuild-6.1" \
--distribution {{debian_distribution}} \ --distribution "{{debian_distribution}}" \
--firmware-binary false \ --firmware-binary false \
--firmware-chroot false \ --firmware-chroot false \
--iso-application "VyOS" \ --iso-application "VyOS" \
--iso-publisher "{{build_by}}" \ --iso-publisher "{{build_by}}" \
--iso-volume "VyOS" \ --iso-volume "VyOS" \
--linux-flavours {{kernel_flavor}} \ --linux-flavours "{{kernel_flavor}}" \
--linux-packages linux-image-{{kernel_version}} \ --linux-packages "linux-image-{{kernel_version}}" \
--mirror-binary {{debian_mirror}} \ --mirror-binary "{{debian_mirror}}" \
--mirror-binary-security {{debian_security_mirror}} \ --mirror-binary-security "{{debian_security_mirror}}" \
--mirror-bootstrap {{debian_mirror}} \ --mirror-bootstrap "{{debian_mirror}}" \
--mirror-chroot {{debian_mirror}} \ --mirror-chroot "{{debian_mirror}}" \
--mirror-chroot-security {{debian_security_mirror}} \ --mirror-chroot-security "{{debian_security_mirror}}" \
--security true \ --security true \
--updates true \ --updates true \
--utc-time true --utc-time true