diff options
Diffstat (limited to 'data')
7 files changed, 4 insertions, 97 deletions
diff --git a/data/defaults.json b/data/defaults.json index 507dd376..707d4195 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -1,8 +1,8 @@ { "architecture": "amd64", "debian_mirror": "http://deb.debian.org/debian", - "debian_security_mirror": "http://deb.debian.org/debian-security", - "debian_distribution": "buster", + "debian_security_mirror": "http://deb.debian.org/debian", + "debian_distribution": "bullseye", "vyos_mirror": "http://dev.packages.vyos.net/repositories/current", "vyos_branch": "current", "kernel_version": "5.10.45", diff --git a/data/live-build-config/archives/bullseye.list.chroot b/data/live-build-config/archives/bullseye.list.chroot deleted file mode 100644 index 16eb57e5..00000000 --- a/data/live-build-config/archives/bullseye.list.chroot +++ /dev/null @@ -1 +0,0 @@ -deb http://deb.debian.org/debian/ bullseye main diff --git a/data/live-build-config/archives/bullseye.pref.chroot b/data/live-build-config/archives/bullseye.pref.chroot deleted file mode 100644 index 7c7f38f3..00000000 --- a/data/live-build-config/archives/bullseye.pref.chroot +++ /dev/null @@ -1,47 +0,0 @@ -Package: libyang1 -Pin: release n=bullseye -Pin-Priority: 600 - -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: python3-cryptography -Pin: release n=bullseye -Pin-Priority: 600 - -Package: python3-paramiko -Pin: release n=bullseye -Pin-Priority: 600 - -Package: * -Pin: release n=bullseye -Pin-Priority: -10 diff --git a/data/live-build-config/archives/buster-backports.pref.chroot b/data/live-build-config/archives/buster-backports.pref.chroot deleted file mode 100644 index e6eee698..00000000 --- a/data/live-build-config/archives/buster-backports.pref.chroot +++ /dev/null @@ -1,31 +0,0 @@ -Package: nftables -Pin: release n=buster-backports -Pin-Priority: 600 - -Package: libnftables1 -Pin: release n=buster-backports -Pin-Priority: 600 - -Package: libnftnl11 -Pin: release n=buster-backports -Pin-Priority: 600 - -Package: conserver-server -Pin: release n=buster-backports -Pin-Priority: 600 - -Package: conserver-client -Pin: release n=buster-backports -Pin-Priority: 600 - -Package: keepalived -Pin: release n=buster-backports -Pin-Priority: 600 - -Package: wireguard-tools -Pin: release n=buster-backports -Pin-Priority: 600 - -Package: * -Pin: release n=buster-backports -Pin-Priority: -10 diff --git a/data/live-build-config/hooks/live/30-frr-configs.chroot b/data/live-build-config/hooks/live/30-frr-configs.chroot index 3180e36d..a5afed2d 100755 --- a/data/live-build-config/hooks/live/30-frr-configs.chroot +++ b/data/live-build-config/hooks/live/30-frr-configs.chroot @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # For FRR to work in VyOS as expected we need a few fixups # diff --git a/data/live-build-config/hooks/live/30-openvmtools-configs.chroot b/data/live-build-config/hooks/live/30-openvmtools-configs.chroot deleted file mode 100755 index e3762cc9..00000000 --- a/data/live-build-config/hooks/live/30-openvmtools-configs.chroot +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env python - -# open-vm-tools settings - -import re - -vmtools_config = """ -[guestinfo] - poll-interval=30 - -""" - -with open('/etc/vmware-tools/tools.conf', 'w') as f: - f.write(vmtools_config) diff --git a/data/live-build-config/hooks/live/30-strongswan-configs.chroot b/data/live-build-config/hooks/live/30-strongswan-configs.chroot index 59e000a9..a0efc126 100755 --- a/data/live-build-config/hooks/live/30-strongswan-configs.chroot +++ b/data/live-build-config/hooks/live/30-strongswan-configs.chroot @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # The Cisco Unity plugin, that implements a proprietary extension # for IPsec split tunneling, interfers with DMVPN |