diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-09-05 15:42:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-05 15:42:15 +0100 |
| commit | c319ca672370216f88cd9f5e65f370bfea4ee7db (patch) | |
| tree | 71a85d9cd48a9ed7183cf2ec4232f4f8da3d13a6 /data | |
| parent | a6a4f08d56ad4076250f8cf96d588a5e00c755bc (diff) | |
| parent | 68671774f9161e502b99f9a2aeb63f9427a6f63c (diff) | |
| download | vyos-build-c319ca672370216f88cd9f5e65f370bfea4ee7db.tar.gz vyos-build-c319ca672370216f88cd9f5e65f370bfea4ee7db.zip | |
Merge pull request #751 from c-po/secure-boot-cleanup
T1416: T861: T3664: T3664: T2640: various cleanup commits
Diffstat (limited to 'data')
| -rw-r--r-- | data/architectures/amd64.toml | 2 | ||||
| -rw-r--r-- | data/architectures/arm64.toml | 4 | ||||
| -rw-r--r-- | data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry | 20 |
3 files changed, 3 insertions, 23 deletions
diff --git a/data/architectures/amd64.toml b/data/architectures/amd64.toml index 5f9a7645..44a203a2 100644 --- a/data/architectures/amd64.toml +++ b/data/architectures/amd64.toml @@ -14,6 +14,4 @@ packages = [ "vyos-intel-ixgbevf", "mlnx-ofed-kernel-modules", "mlnx-tools", - "openvpn-dco", - "telegraf" ] 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" 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 -} - |