From f025a9c41dca06452e03a7f0e55cda0b6764038c Mon Sep 17 00:00:00 2001 From: Matthew Booth Date: Fri, 4 Dec 2009 15:38:09 +0000 Subject: [PATCH] appliance: Fix code which gets list of kernels. The first 'ls' command was failing, so the second 'ls' command would never run at all. --- appliance/libguestfs-supermin-helper.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/appliance/libguestfs-supermin-helper.in b/appliance/libguestfs-supermin-helper.in index 4d8fd04..ab3aad5 100755 --- a/appliance/libguestfs-supermin-helper.in +++ b/appliance/libguestfs-supermin-helper.in @@ -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 -- 1.8.3.1