From d50707bb295dbd4bc50e3d0301fc8be605448429 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Wed, 4 Sep 2024 20:44:01 +0200 Subject: T1416: remove deprecated default-union-grub-entry --- .../opt/vyatta/etc/grub/default-union-grub-entry | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry (limited to 'data') diff --git a/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry b/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry deleted file mode 100644 index 49f4afc4..00000000 --- a/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry +++ /dev/null @@ -1,20 +0,0 @@ -menuentry "VyOS (KVM console)" { - linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 udev.exec_delay=3 vyos-union=/boot/ console=ttyS0,115200 console=tty0 - initrd /boot//initrd.img -} - -menuentry "VyOS (Serial console)" { - linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 udev.exec_delay=3 vyos-union=/boot/ console=tty0 console=ttyS0,115200 - initrd /boot//initrd.img -} - -menuentry "Lost password change (KVM console)" { - linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 udev.exec_delay=3 vyos-union=/boot/ console=ttyS0,115200 console=tty0 init=/opt/vyatta/sbin/standalone_root_pw_reset - initrd /boot//initrd.img -} - -menuentry "Lost password change (Serial console)" { - linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 udev.exec_delay=3 vyos-union=/boot/ console=tty0 console=ttyS0,115200 init=/opt/vyatta/sbin/standalone_root_pw_reset - initrd /boot//initrd.img -} - -- cgit v1.2.3 From f53921911efa73d53b3dc20bddac7203976219e1 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Wed, 4 Sep 2024 21:05:51 +0200 Subject: telegraf: T3664: remove package dependency Telegraf is not a full VyOS feature with a proper dependency in place via vyos-1x package. Drop this temporary dependency. --- data/architectures/amd64.toml | 1 - 1 file changed, 1 deletion(-) (limited to 'data') diff --git a/data/architectures/amd64.toml b/data/architectures/amd64.toml index 5f9a7645..7a781869 100644 --- a/data/architectures/amd64.toml +++ b/data/architectures/amd64.toml @@ -15,5 +15,4 @@ packages = [ "mlnx-ofed-kernel-modules", "mlnx-tools", "openvpn-dco", - "telegraf" ] -- cgit v1.2.3 From 68671774f9161e502b99f9a2aeb63f9427a6f63c Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Wed, 4 Sep 2024 21:19:45 +0200 Subject: T4974: remove package openvpn-dco as it has a proper dependency via vyos-1x --- data/architectures/amd64.toml | 1 - data/architectures/arm64.toml | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/architectures/amd64.toml b/data/architectures/amd64.toml index 7a781869..44a203a2 100644 --- a/data/architectures/amd64.toml +++ b/data/architectures/amd64.toml @@ -14,5 +14,4 @@ packages = [ "vyos-intel-ixgbevf", "mlnx-ofed-kernel-modules", "mlnx-tools", - "openvpn-dco", ] diff --git a/data/architectures/arm64.toml b/data/architectures/arm64.toml index ff95d0cf..22f1fd10 100644 --- a/data/architectures/arm64.toml +++ b/data/architectures/arm64.toml @@ -5,5 +5,7 @@ additional_repositories = [ kernel_flavor = "arm64-vyos" # Packages included in ARM64 images by default -packages = ["grub-efi-arm64", "openvpn-dco"] +packages = [ + "grub-efi-arm64", +] bootloaders = "grub-efi" -- cgit v1.2.3