arch replumbing: ts-debian-di-install: Use $gho->{Arch}

This is just tidying up.  The only effect is that now these would
honour $r{all_guest_arch} as a fallback.  But right now,
$r{GUEST_arch} will always be set, and that is what ends up in
$gho->{Arch}.

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

diff --git a/ts-debian-di-install b/ts-debian-di-install
index 5cb3d35d1914c3a374dce9be92d415454ca67f82..9abb4956b912d6233a7016729e2a1e5b1e7d7d43 100755 (executable)
--- a/ts-debian-di-install
+++ b/ts-debian-di-install
@@ -174,7 +174,7 @@ END
 }
 
 sub ginstall () {
-    my $arch= $r{"$gho->{Guest}_arch"};
+    my $arch= $gho->{Arch};
     my $method= $r{"$gho->{Guest}_method"};
 
     my $tmpdir= "/root/$flight-$job-di";

diff --git a/ts-debian-install b/ts-debian-install
index 5bbaead0445264c568ce724893bbdc0837f2db88..f07dd67628a0b3691b18f916c290de6f0a0d720c 100755 (executable)
--- a/ts-debian-install
+++ b/ts-debian-install
@@ -47,7 +47,7 @@ sub prep () {
 }
 
 sub ginstall () {
-    my $arch= $r{"$gho->{Guest}_arch"};
+    my $arch= $gho->{Arch};
     my $archarg= defined($arch) ? "--arch $arch" : '';
     my $gsuite= debian_guest_suite($gho);