ts-xen-install: Honour DebianExtraPackages_<suite>

This allows us to specify some packages to install regardless of
firmware and architecture.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/README b/README
index 2dfd4deb00368425bdac731189f2540fde7501e4..e938f64c73e8c9f6bc14e5b30bd34ec0a41c2696 100644 (file)
--- a/README
+++ b/README
@@ -537,6 +537,7 @@ DebianNonfreeFirmware
   grep-dctrl (for example because it's not Debian) then you must set
   this to the empty string, by writing  DebianNonfreeFirmware=''
 
+DebianExtraPackages_<suite> [<item>... ]
 DebianExtraPackages_<firmware>_<arch>_<suite> [<item>... ]
   Extra packages, or directories of them, to install on every Debian
   host (dom0).  Each variable is a space-separated list of items.

diff --git a/ts-xen-install b/ts-xen-install
index 1ec236f9883892fd31e6326f6bdd288161858fa3..3463e172fa9cde34afefc927e001ec3c64bc30d0 100755 (executable)
--- a/ts-xen-install
+++ b/ts-xen-install
@@ -106,6 +106,9 @@ sub some_extradebs ($) {
 sub extradebs () {
     my $suite = $ho->{Suite};
 
+    # $c{ DebianExtraPackages_<suite> }
+    some_extradebs([ 'DebianExtraPackages', $suite ]);
+
     # $c{ DebianExtraPackages_<firmware>_<arch>_<suite> }
     my $firmware = get_host_property($ho, "firmware", "bios");
     some_extradebs([ 'DebianExtraPackages', $firmware, $r{arch}, $suite ]);