ts-xen-install: fix installation of libyajl[12]

qw doesn't interpolate so it was trying to install $yajl, which was eaten by
the shell on the target.

Also flip the condition round and install yajl1 on squeeze and yajl2
otherwise, which is a little more future proof.

diff --git a/ts-xen-install b/ts-xen-install
index 78684946e3cf5f4f03184f440be06a18904b9ac2..d70664985e76cd5b51e7b2e131085fafba4d1d6d 100755 (executable)
--- a/ts-xen-install
+++ b/ts-xen-install
@@ -47,10 +47,11 @@ our $ho;
 my %distpath;
 
 sub packages () {
-    my $yajl = $ho->{Suite} =~ "/wheezy/" ? "libyajl2" : "libyajl1";
     target_install_packages($ho,
                             qw(bridge-utils vncsnapshot libaio1 libpixman-1-0
-                               libsdl1.2debian $yajl libglib2.0-0));
+                               libsdl1.2debian libglib2.0-0));
+    target_install_packages($ho,
+                           $ho->{Suite} =~ /squeeze/ ? "libyajl1" : "libyajl2");
     if ($r{arch} eq 'i386') {
        target_install_packages($ho, 'libc6-xen');
     }