[Xen-devel] [OSSTEST PATCH 31/35] d-i: preseed_create_guest: Break out preseed_backports_packages

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

No functional change.

Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
 Osstest/Debian.pm | 39 +++++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 4c73318..f496354 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -927,6 +927,31 @@ END
     return $preseed;
 }
 
+sub preseed_backports_packages ($$$$@) {
+    my ($ho, $sfx, $xopts, $suite, @pkgs) = @_;
+
+    if (! $xopts->{BackportsSourcesAlreadyAdded}++) {
+       preseed_hook_command($ho, 'late_command', $sfx, <<END);
+#!/bin/sh
+set -ex
+
+cat <<EOF >>/target/etc/apt/sources.list
+
+# $suite backports
+deb http://$c{DebianMirrorHost}/$c{DebianMirrorSubpath} $suite-backports main
+EOF
+in-target apt-get update
+END
+    }
+
+    preseed_hook_command($ho, 'late_command', $sfx, <<END);
+#!/bin/sh
+set -ex
+
+in-target apt-get install -y -t $suite-backports @pkgs
+END
+}
+
 sub preseed_create_guest ($$$;@) {
     my ($ho, $arch, $sfx, %xopts) = @_;
 
@@ -948,18 +973,8 @@ sub preseed_create_guest ($$$;@) {
             # the Grub device.map isn't present at pkgsel/include time
             # but it is by late_command time. This was fixed by
             # version 1.3 which is in Jessie onwards.
-            preseed_hook_command($ho, 'late_command', $sfx, <<END);
-#!/bin/sh
-set -ex
-
-cat <<EOF >>/target/etc/apt/sources.list
-
-# $suite backports
-deb http://$c{DebianMirrorHost}/$c{DebianMirrorSubpath} $suite-backports main
-EOF
-in-target apt-get update
-in-target apt-get install -y -t wheezy-backports pv-grub-menu
-END
+           preseed_backports_packages($ho, $sfx, \%xopts, $suite,
+                                      qw(pv-grub-menu));
         } else {
             $extra_packages = "pv-grub-menu";
         }
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel