diff options
| -rw-r--r-- | data/defaults.json | 2 | ||||
| -rw-r--r-- | data/live-build-config/archives/bullseye.pref.chroot | 28 | ||||
| -rwxr-xr-x | scripts/check-qemu-install | 3 |
3 files changed, 32 insertions, 1 deletions
diff --git a/data/defaults.json b/data/defaults.json index 6d72c135..1ca23325 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -5,7 +5,7 @@ "debian_distribution": "buster", "vyos_mirror": "http://dev.packages.vyos.net/repositories/current", "vyos_branch": "current", - "kernel_version": "5.10.28", + "kernel_version": "5.10.32", "kernel_flavor": "amd64-vyos", "release_train": "sagitta", "additional_repositories": [ diff --git a/data/live-build-config/archives/bullseye.pref.chroot b/data/live-build-config/archives/bullseye.pref.chroot index 83e6c786..390c3a90 100644 --- a/data/live-build-config/archives/bullseye.pref.chroot +++ b/data/live-build-config/archives/bullseye.pref.chroot @@ -6,6 +6,34 @@ Package: ddclient Pin: release n=bullseye Pin-Priority: 600 +Package: podman +Pin: release n=bullseye +Pin-Priority: 600 + +Package: conmon +Pin: release n=bullseye +Pin-Priority: 600 + +Package: containernetworking-plugins +Pin: release n=bullseye +Pin-Priority: 600 + +Package: golang-github-containers-image +Pin: release n=bullseye +Pin-Priority: 600 + +Package: golang-github-containers-common +Pin: release n=bullseye +Pin-Priority: 600 + +Package: libseccomp2 +Pin: release n=bullseye +Pin-Priority: 600 + +Package: runc +Pin: release n=bullseye +Pin-Priority: 600 + Package: * Pin: release n=bullseye Pin-Priority: -10 diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index 90cc6017..1daaa6be 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -132,6 +132,9 @@ def get_qemu_cmd(name, enable_kvm, disk_img, iso_img=None): -netdev user,id=n2 -device virtio-net-pci,netdev=n2,mac={macbase}:02 \ -netdev user,id=n3 -device virtio-net-pci,netdev=n3,mac={macbase}:03 \ -netdev user,id=n4 -device virtio-net-pci,netdev=n4,mac={macbase}:04 \ + -netdev user,id=n5 -device virtio-net-pci,netdev=n5,mac={macbase}:05 \ + -netdev user,id=n6 -device virtio-net-pci,netdev=n6,mac={macbase}:06 \ + -netdev user,id=n7 -device virtio-net-pci,netdev=n7,mac={macbase}:07 \ -machine accel=kvm \ -nographic {cpu} {cdrom} {kvm} \ -drive format=raw,file={disk_img}' |