13 files changed, 18 insertions, 17 deletions
diff --git a/data/build-flavors/generic.toml b/data/build-flavors/generic.toml
index 9bf7044d..f9ab5cab 100644
--- a/data/build-flavors/generic.toml
+++ b/data/build-flavors/generic.toml
@@ -6,7 +6,7 @@ image_format = "iso"
 packages = [
   # QEMU and Xen guest tools exist for multiple architectures
   "qemu-guest-agent",
-  "vyos-xe-guest-utilities",
+  "xen-guest-agent"
 ]
 
 [architectures.amd64]
diff --git a/data/build-flavors/xcpng.toml b/data/build-flavors/xcpng.toml
deleted file mode 100644
index 3a04177f..00000000
--- a/data/build-flavors/xcpng.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-# Installation ISO for the XCP-ng virtualization platform
-
-image_format = "iso"
-
-# Include these packages in the image
-packages = ["xe-guest-utilities"]
diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image
index dfa5dfbe..7da06fe7 100755
--- a/scripts/image-build/build-vyos-image
+++ b/scripts/image-build/build-vyos-image
@@ -194,7 +194,8 @@ if __name__ == "__main__":
        'build-type': ('Build type, release or development', lambda x: x in ['release', 'development']),
        'version': ('Version string', None),
        'build-comment': ('Optional build comment', None),
-       'build-hook-opts': ('Custom options for the post-build hook', None)
+       'build-hook-opts': ('Custom options for the post-build hook', None),
+       'bootloaders': ('Bootloaders to include in the image', None)
     }
 
     # Create the option parser
@@ -319,6 +320,10 @@ if __name__ == "__main__":
         print("E: image format is not specified in the build flavor file")
         sys.exit(1)
 
+    ## Override bootloaders if specified
+    if args['bootloaders'] is not None:
+        build_config['bootloaders'] = args['bootloaders']
+
     ## Add default boot settings if needed
     if "boot_settings" not in build_config:
         build_config["boot_settings"] = defaults.boot_settings
diff --git a/scripts/package-build/dropbear/.gitignore b/scripts/package-build/dropbear/.gitignore
index 6e8cff9c..3d080d7c 100644
--- a/scripts/package-build/dropbear/.gitignore
+++ b/scripts/package-build/dropbear/.gitignore
@@ -4,4 +4,4 @@ dropbear/
 *.changes
 *.deb
 *.dsc
-
+*.tar.gz
diff --git a/scripts/package-build/dropbear/package.toml b/scripts/package-build/dropbear/package.toml
index cbb885ee..a00aad3d 100644
--- a/scripts/package-build/dropbear/package.toml
+++ b/scripts/package-build/dropbear/package.toml
@@ -3,5 +3,5 @@ name = "dropbear"
 commit_id = "debian/2022.83-1+deb12u1"
 scm_url = "https://salsa.debian.org/debian/dropbear.git"
 
-[packages.dependencies]
-packages = ["libpam0g-dev"]
-\ No newline at end of file
+[dependencies]
+packages = ["libpam0g-dev"]
diff --git a/scripts/package-build/hsflowd/.gitignore b/scripts/package-build/hsflowd/.gitignore
index d0964b29..ecb384cd 100644
--- a/scripts/package-build/hsflowd/.gitignore
+++ b/scripts/package-build/hsflowd/.gitignore
@@ -4,3 +4,4 @@ host-sflow/
 *.changes
 *.deb
 *.dsc
+*.tar.gz
diff --git a/scripts/package-build/hsflowd/package.toml b/scripts/package-build/hsflowd/package.toml
index 75d320a7..8418319e 100644
--- a/scripts/package-build/hsflowd/package.toml
+++ b/scripts/package-build/hsflowd/package.toml
@@ -4,5 +4,5 @@ commit_id = "v2.0.55-1"
 scm_url = "https://github.com/sflow/host-sflow.git"
 build_cmd = "make deb FEATURES='PCAP DROPMON DBUS'"
 
-[packages.dependencies]
+[dependencies]
 packages = ["libpcap0.8-dev"]
diff --git a/scripts/package-build/isc-dhcp/.gitignore b/scripts/package-build/isc-dhcp/.gitignore
index 66d17cc8..3f2ca44a 100644
--- a/scripts/package-build/isc-dhcp/.gitignore
+++ b/scripts/package-build/isc-dhcp/.gitignore
@@ -4,4 +4,4 @@ isc-dhcp/
 *.changes
 *.deb
 *.dsc
-
+*.tar.gz
diff --git a/scripts/package-build/isc-dhcp/package.toml b/scripts/package-build/isc-dhcp/package.toml
index 76a0e4a1..f07e71e3 100644
--- a/scripts/package-build/isc-dhcp/package.toml
+++ b/scripts/package-build/isc-dhcp/package.toml
@@ -3,5 +3,5 @@ name = "isc-dhcp"
 commit_id = "debian/4.4.3-P1-4"
 scm_url = "https://salsa.debian.org/debian/isc-dhcp"
 
-[packages.dependencies]
+[dependencies]
 packages = ["libpam0g-dev"]
diff --git a/scripts/package-build/podman/package.toml b/scripts/package-build/podman/package.toml
index 952af518..707f3d7e 100644
--- a/scripts/package-build/podman/package.toml
+++ b/scripts/package-build/podman/package.toml
@@ -20,7 +20,7 @@ fpm --input-type dir --output-type deb --name podman \
     --license "Apache License 2.0" -C podman-v$VERSION --package ..
 """
 
-[packages.dependencies]
+[dependencies]
 packages = [
     "libseccomp-dev",
     "libgpgme-dev"
diff --git a/scripts/package-build/strongswan/.gitignore b/scripts/package-build/strongswan/.gitignore
index ec612740..f1ad761d 100644
--- a/scripts/package-build/strongswan/.gitignore
+++ b/scripts/package-build/strongswan/.gitignore
@@ -4,3 +4,4 @@ strongswan/
 *.changes
 *.deb
 *.dsc
+*.tar.gz
diff --git a/scripts/package-build/strongswan/package.toml b/scripts/package-build/strongswan/package.toml
index 8cedd4ac..a5722062 100644
--- a/scripts/package-build/strongswan/package.toml
+++ b/scripts/package-build/strongswan/package.toml
@@ -13,7 +13,7 @@ dpkg-buildpackage -uc -us -tc -b -d
 cd ..; ./build-vici.sh
 """
 
-[packages.dependencies]
+[dependencies]
 packages = [
     "bison",
     "bzip2",
diff --git a/scripts/package-build/waagent/package.toml b/scripts/package-build/waagent/package.toml
index d7343a7a..1a382baa 100644
--- a/scripts/package-build/waagent/package.toml
+++ b/scripts/package-build/waagent/package.toml
@@ -3,5 +3,5 @@ name = "waagent"
 commit_id = "debian/2.9.1.1-2"
 scm_url = "https://salsa.debian.org/cloud-team/waagent.git"
 
-[packages.dependencies]
+[dependencies]
 packages = ["dpkg-source-gitarchive"]