diff options
Diffstat (limited to 'data')
20 files changed, 18 insertions, 38 deletions
diff --git a/data/architectures/amd64.toml b/data/architectures/amd64.toml index c479ea9c..8ea3e91f 100644 --- a/data/architectures/amd64.toml +++ b/data/architectures/amd64.toml @@ -10,5 +10,6 @@ packages = [ "grub-pc", "vyos-linux-firmware", "vyos-intel-qat", + "openvpn-dco", "telegraf" ] diff --git a/data/architectures/arm64.toml b/data/architectures/arm64.toml index e48d9f49..3f1e4c1d 100644 --- a/data/architectures/arm64.toml +++ b/data/architectures/arm64.toml @@ -2,8 +2,8 @@ additional_repositories = [ "deb [arch=arm64] https://repo.saltproject.io/py3/debian/11/arm64/3004 bullseye main" ] -kernel_flavor = "v8-arm64-vyos" +kernel_flavor = "arm64-vyos" # Packages included in ARM64 images by default -packages = ["grub-efi-arm64"] -bootloaders = "grub-efi"
\ No newline at end of file +packages = ["grub-efi-arm64", "openvpn-dco"] +bootloaders = "grub-efi" diff --git a/data/defaults.toml b/data/defaults.toml index f9d48219..1489c8a2 100644 --- a/data/defaults.toml +++ b/data/defaults.toml @@ -14,7 +14,7 @@ vyos_mirror = "http://dev.packages.vyos.net/repositories/current" vyos_branch = "current" release_train = "current" -kernel_version = "6.1.32" +kernel_version = "6.1.47" bootloaders = "syslinux,grub-efi" website_url = "https://vyos.io" diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index b0824f4d..26bdfc7f 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -63,17 +63,22 @@ systemctl disable miniupnpd.service systemctl disable owamp-server.service systemctl disable twamp-server.service systemctl disable podman-auto-update.service +systemctl disable podman-auto-update.timer systemctl disable podman-restart.service systemctl disable vyos-wan-load-balance.service systemctl disable nvmf-autoconnect.service -systemctl disable sendmail.service +systemctl disable vpp.service +systemctl disable dpkg-db-backup.timer +systemctl disable dpkg-db-backup.service +systemctl disable zabbix-agent2.service echo I: Enabling services -systemctl enable frr.service systemctl enable ssh-session-cleanup.service systemctl enable vyos-hostsd.service systemctl enable acpid.service +systemctl enable vyos-router.service systemctl enable vyos-configd.service echo I: Masking services systemctl mask systemd-journald-audit.socket +systemctl --global mask gpg-agent.service gpg-agent.socket gpg-agent-ssh.socket gpg-agent-extra.socket gpg-agent-browser.socket dirmngr.socket 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 47b72300..d46c3c42 100755 --- a/data/live-build-config/hooks/live/30-frr-configs.chroot +++ b/data/live-build-config/hooks/live/30-frr-configs.chroot @@ -40,6 +40,7 @@ isisd_options="--daemon -A 127.0.0.1 -M snmp" pimd_options="--daemon -A 127.0.0.1" ldpd_options="--daemon -A 127.0.0.1" nhrpd_options="--daemon -A 127.0.0.1" +mgmtd_options=" --daemon -A 127.0.0.1" eigrpd_options="--daemon -A 127.0.0.1" babeld_options="--daemon -A 127.0.0.1" sharpd_options="--daemon -A 127.0.0.1" diff --git a/data/live-build-config/hooks/live/80-delete-docs.chroot b/data/live-build-config/hooks/live/80-delete-docs.chroot index ce18bc8f..33a6bf74 100755 --- a/data/live-build-config/hooks/live/80-delete-docs.chroot +++ b/data/live-build-config/hooks/live/80-delete-docs.chroot @@ -4,3 +4,8 @@ # Copyright/licenses files are ignored for deletion shopt -s extglob rm -rf /usr/share/doc/*/!(copyright*|README*) /usr/share/doc-base + +# We also do not need any manpages on the system since man-binary is missing. +# This also frees some space. +rm -rf /usr/share/man + diff --git a/data/live-build-config/includes.chroot/etc/c3xxx_dev0.conf b/data/live-build-config/includes.chroot/etc/c3xxx_dev0.conf index 5e133fa9..5e133fa9 100755..100644 --- a/data/live-build-config/includes.chroot/etc/c3xxx_dev0.conf +++ b/data/live-build-config/includes.chroot/etc/c3xxx_dev0.conf diff --git a/data/live-build-config/includes.chroot/etc/c3xxx_dev1.conf b/data/live-build-config/includes.chroot/etc/c3xxx_dev1.conf index 5e133fa9..5e133fa9 100755..100644 --- a/data/live-build-config/includes.chroot/etc/c3xxx_dev1.conf +++ b/data/live-build-config/includes.chroot/etc/c3xxx_dev1.conf diff --git a/data/live-build-config/includes.chroot/etc/c3xxx_dev2.conf b/data/live-build-config/includes.chroot/etc/c3xxx_dev2.conf index 5e133fa9..5e133fa9 100755..100644 --- a/data/live-build-config/includes.chroot/etc/c3xxx_dev2.conf +++ b/data/live-build-config/includes.chroot/etc/c3xxx_dev2.conf diff --git a/data/live-build-config/includes.chroot/etc/c6xx_dev0.conf b/data/live-build-config/includes.chroot/etc/c6xx_dev0.conf index 5e133fa9..5e133fa9 100755..100644 --- a/data/live-build-config/includes.chroot/etc/c6xx_dev0.conf +++ b/data/live-build-config/includes.chroot/etc/c6xx_dev0.conf diff --git a/data/live-build-config/includes.chroot/etc/c6xx_dev1.conf b/data/live-build-config/includes.chroot/etc/c6xx_dev1.conf index 5e133fa9..5e133fa9 100755..100644 --- a/data/live-build-config/includes.chroot/etc/c6xx_dev1.conf +++ b/data/live-build-config/includes.chroot/etc/c6xx_dev1.conf diff --git a/data/live-build-config/includes.chroot/etc/c6xx_dev2.conf b/data/live-build-config/includes.chroot/etc/c6xx_dev2.conf index 5e133fa9..5e133fa9 100755..100644 --- a/data/live-build-config/includes.chroot/etc/c6xx_dev2.conf +++ b/data/live-build-config/includes.chroot/etc/c6xx_dev2.conf diff --git a/data/live-build-config/includes.chroot/etc/d15xx_dev0.conf b/data/live-build-config/includes.chroot/etc/d15xx_dev0.conf index 5e133fa9..5e133fa9 100755..100644 --- a/data/live-build-config/includes.chroot/etc/d15xx_dev0.conf +++ b/data/live-build-config/includes.chroot/etc/d15xx_dev0.conf diff --git a/data/live-build-config/includes.chroot/etc/d15xx_dev1.conf b/data/live-build-config/includes.chroot/etc/d15xx_dev1.conf index 5e133fa9..5e133fa9 100755..100644 --- a/data/live-build-config/includes.chroot/etc/d15xx_dev1.conf +++ b/data/live-build-config/includes.chroot/etc/d15xx_dev1.conf diff --git a/data/live-build-config/includes.chroot/etc/d15xx_dev2.conf b/data/live-build-config/includes.chroot/etc/d15xx_dev2.conf index 5e133fa9..5e133fa9 100755..100644 --- a/data/live-build-config/includes.chroot/etc/d15xx_dev2.conf +++ b/data/live-build-config/includes.chroot/etc/d15xx_dev2.conf diff --git a/data/live-build-config/includes.chroot/etc/dh895xcc_dev0.conf b/data/live-build-config/includes.chroot/etc/dh895xcc_dev0.conf index 2f0eead7..2f0eead7 100755..100644 --- a/data/live-build-config/includes.chroot/etc/dh895xcc_dev0.conf +++ b/data/live-build-config/includes.chroot/etc/dh895xcc_dev0.conf diff --git a/data/live-build-config/includes.chroot/etc/dh895xcc_dev1.conf b/data/live-build-config/includes.chroot/etc/dh895xcc_dev1.conf index 2f0eead7..2f0eead7 100755..100644 --- a/data/live-build-config/includes.chroot/etc/dh895xcc_dev1.conf +++ b/data/live-build-config/includes.chroot/etc/dh895xcc_dev1.conf diff --git a/data/live-build-config/includes.chroot/etc/dh895xcc_dev2.conf b/data/live-build-config/includes.chroot/etc/dh895xcc_dev2.conf index 2f0eead7..2f0eead7 100755..100644 --- a/data/live-build-config/includes.chroot/etc/dh895xcc_dev2.conf +++ b/data/live-build-config/includes.chroot/etc/dh895xcc_dev2.conf diff --git a/data/live-build-config/includes.chroot/etc/netplug/netplug b/data/live-build-config/includes.chroot/etc/netplug/netplug deleted file mode 100755 index 699be5fd..00000000 --- a/data/live-build-config/includes.chroot/etc/netplug/netplug +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# vyos policy agent for netplugd -# - -dev="$1" -action="$2" - -case "$action" in -in) - run-parts -a $dev /etc/netplug/linkup.d - ;; -out) - run-parts -a $dev /etc/netplug/linkdown.d - ;; - -# probe loads and initialises the driver for the interface and brings the -# interface into the "up" state, so that it can generate netlink(7) events. -# This interferes with "admin down" for an interface. Thus, commented out. An -# "admin up" is treated as a "link up" and thus, "link up" action is executed. -# To execute "link down" action on "admin down", run appropriate script in -# /etc/netplug/linkdown.d -#probe) -# ;; - -*) - exit 1 - ;; -esac diff --git a/data/live-build-config/includes.chroot/etc/netplug/netplugd.conf b/data/live-build-config/includes.chroot/etc/netplug/netplugd.conf deleted file mode 100644 index ab4d826d..00000000 --- a/data/live-build-config/includes.chroot/etc/netplug/netplugd.conf +++ /dev/null @@ -1,3 +0,0 @@ -eth* -br* -bond* |