dm restrict audit: install newer chiark-scripts for fishdescriptor

fishdescriptor is not in stretch or earlier.  It will be in buster,
and we expect that a suitable version will be available in
stretch-backports soon.

For jessie, use DebianExtraPackages to install the .deb from buster
(which is directly installable on jessie).

Deployment note: I have already copied the .deb to the images
directories in Massachusetts and Cambridge.

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

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 9789ca68dfed39faa60c57efb528b8c7c86dfe1c..2c1e6ed49b3720601c8b060f5269423726648b63 100644 (file)
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -1023,6 +1023,11 @@ sub preseed_create_guest ($$$;@) {
             $extra_packages = "pv-grub-menu";
         }
     }
+    if (grep { m/_dmrestrict$/ && $r{$_} } keys %r and
+       $suite =~ m/stretch/) {
+       preseed_backports_packages($ho, $sfx, \%xopts, $suite,
+                                  qw(chiark-utils-bin));
+    }
 
     my $preseed_file= preseed_base($ho, $sfx, $extra_packages, %xopts);
     $preseed_file.= (<<END);

diff --git a/production-config b/production-config
index d89e89a434ee63d7fc31bf81c6a96aeff6536f80..61148368227487683de92da73175a05a83be9228 100644 (file)
--- a/production-config
+++ b/production-config
@@ -106,6 +106,8 @@ MicrocodeUpdateI386 microcode.x86.2015-06-12.cpio
 # Update with ./mg-netgrub-loader-update
 TftpGrubVersion XXXX-XX-XX
 
+DebianExtraPackages_jessie chiark-scripts_6.0.2_all.deb
+
 DebianExtraPackages_uefi_i386_jessie   extradebs-uefi-i386-2018-04-01/
 DebianExtraPackages_uefi_amd64_jessie  extradebs-uefi-amd64-2018-04-01/
 DebianExtraPackages_uefi_i386_stretch  extradebs-uefi-i386-2018-04-01/

diff --git a/production-config-cambridge b/production-config-cambridge
index 1d6e67be85debc1e5758e806f6bb167e11e62831..9d58b0db1a3b7bfe6dd32bff25a134b528c87fb6 100644 (file)
--- a/production-config-cambridge
+++ b/production-config-cambridge
@@ -79,6 +79,8 @@ TftpDiVersion_jessie 2018-04-09
 DebianImageVersion_wheezy 7.2.0
 DebianImageVersion_jessie 8.2.0
 
+DebianExtraPackages_jessie chiark-scripts_6.0.2_all.deb
+
 # These should normally be the same.
 MicrocodeUpdateAmd64 microcode.x86.2015-06-12.cpio
 MicrocodeUpdateI386 microcode.x86.2015-06-12.cpio