appliance: Fix code which gets list of kernels.
authorMatthew Booth <mbooth@redhat.com>
Fri, 4 Dec 2009 15:38:09 +0000 (15:38 +0000)
committerRichard Jones <rjones@redhat.com>
Mon, 7 Dec 2009 11:13:12 +0000 (11:13 +0000)
The first 'ls' command was failing, so the second 'ls' command
would never run at all.

appliance/libguestfs-supermin-helper.in

index 4d8fd04..ab3aad5 100755 (executable)
@@ -38,7 +38,10 @@ initrd="$3"
 # without arch second.
 
 arch=$(echo "@host_cpu@" | sed 's/^i.86$/i?86/')
-kernels=$(ls -1dvr /boot/vmlinuz-*.$arch* 2>/dev/null | grep -v xen; ls -1dvr /boot/vmlinuz-* 2>/dev/null | grep -v xen)
+kernels=$(
+    ls -1dvr /boot/vmlinuz-*.$arch* 2>/dev/null | grep -v xen ||: ;
+    ls -1dvr /boot/vmlinuz-* 2>/dev/null | grep -v xen
+)
 
 if [ -z "$kernels" ]; then
     echo "$0: failed to find a suitable kernel in /boot directory" >&2