dm restrict audit: actually install fishdescriptor in host

In
  dm restrict audit: install newer chiark-scripts for fishdescriptor
arrangements were made to install a backport of chiark-scripts
but the code was mistakenly placed in preseed_create_guest but
of course it's needed in the host.

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

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 25bf8e8820b7f023149fa9f7481f8ae9490241ed..8d53bbe105ddf7dd9f4568d8d18aba44e76eb840 100644 (file)
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -1022,6 +1022,12 @@ END
     # security.d.o CDN seems unreliable right now
     # and jessie-updates is no more
 
+    if (grep { m/_dmrestrict$/ && $r{$_} } keys %r and
+       $suite =~ m/stretch/) {
+       preseed_backports_packages($ho, $sfx, \%xopts, $suite,
+                                  qw(chiark-scripts));
+    }
+
     $preseed .= <<"END";
 
 ### END OF DEBIAN PRESEED BASE
@@ -1057,11 +1063,6 @@ 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-scripts));
-    }
 
     my $preseed_file= preseed_base($ho, $sfx, $extra_packages, %xopts);
     $preseed_file.= (<<END);