Merge branch 'vyos:current' into current

6 files changed, 16 insertions, 37 deletions

diff --git a/Makefile b/Makefile
index 48225d6c..6d0f0d47 100644
--- a/Makefile
+++ b/Makefile
@@ -31,28 +31,28 @@ test-no-interfaces: checkiso
 .PHONY: testc
 .ONESHELL:
 testc: checkiso
-	scripts/check-qemu-install --debug --configd --configtest build/live-image-amd64.hybrid.iso
+	scripts/check-qemu-install --debug --configd --configtest build/live-image-amd64.hybrid.iso $(filter-out $@,$(MAKECMDGOALS))
 
 .PHONY: testraid
 .ONESHELL:
 testraid: checkiso
-	scripts/check-qemu-install --debug --configd --raid --configtest build/live-image-amd64.hybrid.iso
+	scripts/check-qemu-install --debug --configd --raid --configtest build/live-image-amd64.hybrid.iso $(filter-out $@,$(MAKECMDGOALS))
+
+.PHONY: testtpm
+.ONESHELL:
+testtpm: checkiso
+	scripts/check-qemu-install --debug --tpmtest build/live-image-amd64.hybrid.iso $(filter-out $@,$(MAKECMDGOALS))
 
 .PHONY: qemu-live
 .ONESHELL:
 qemu-live: checkiso
-	scripts/check-qemu-install --qemu-cmd build/live-image-amd64.hybrid.iso
+	scripts/check-qemu-install --qemu-cmd --uefi build/live-image-amd64.hybrid.iso $(filter-out $@,$(MAKECMDGOALS))
 
-.PHONE: oci
+.PHONY: oci
 .ONESHELL:
 oci: checkiso
 	scripts/iso-to-oci build/live-image-amd64.hybrid.iso
 
-.PHONY: testtpm
-.ONESHELL:
-testtpm: checkiso
-	scripts/check-qemu-install --debug --tpmtest build/live-image-amd64.hybrid.iso
-
 .PHONY: clean
 .ONESHELL:
 clean:
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
-}
-
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f8b0fcb4..d48a4f1f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -50,7 +50,7 @@ LABEL authors="VyOS Maintainers <maintainers@vyos.io>" \
       org.opencontainers.image.title="vyos-build" \
       org.opencontainers.image.description="Container to build VyOS ISO" \
       org.opencontainers.image.base.name="docker.io/debian/debian:bookworm"
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 
 RUN /bin/echo -e 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";' > /etc/apt/apt.conf.d/01norecommends
 
@@ -60,9 +60,9 @@ RUN apt-get update && apt-get install -y \
       locales
 
 RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen
-ENV LANG en_US.utf8
+ENV LANG=en_US.utf8
 
-ENV OCAML_VERSION 4.14.2
+ENV OCAML_VERSION=4.14.2
 
 # Base packaged needed to build packages and their package dependencies
 RUN apt-get update && apt-get install -y \
diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image
index c13d7607..a0acd184 100755
--- a/scripts/image-build/build-vyos-image
+++ b/scripts/image-build/build-vyos-image
@@ -43,10 +43,9 @@ try:
     import tomli
     import jinja2
     import git
-    import psutil
 except ModuleNotFoundError as e:
     print(f"E: Cannot load required library {e}")
-    print("E: Please make sure the following Python3 modules are installed: tomli jinja2 git psutil")
+    print("E: Please make sure the following Python3 modules are installed: tomli jinja2 git")
     sys.exit(1)
 
 # Import local defaults