From: Richard Jones <rjones@redhat.com>
Date: Fri, 4 Dec 2009 15:39:55 +0000 (+0000)
Subject: supermin: Fix code which gets list of kernels.
X-Git-Tag: 2.6~3
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=09e796a0f0257c6dde56a64312db891d450e1b9a;p=febootstrap.git

supermin: Fix code which gets list of kernels.

(Same patch applied to libguestfs).
---

diff --git a/febootstrap-supermin-helper.sh b/febootstrap-supermin-helper.sh
index 0849b1f..f6a54e6 100755
--- a/febootstrap-supermin-helper.sh
+++ b/febootstrap-supermin-helper.sh
@@ -81,7 +81,10 @@ rm -f "$kernel" "$initrd"
 # 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