From 4404688aa3b476c820ef6ed6bea7e855f0a53e90 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Tue, 24 Nov 2009 18:17:07 +0000 Subject: [PATCH] supermin: Die with an error if no kernels found (RHBZ#539746). Updated with a suggestion from Jim Meyering to use the '-d' option to ls to avoid a future case of directories matching. --- appliance/libguestfs-supermin-helper.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/appliance/libguestfs-supermin-helper.in b/appliance/libguestfs-supermin-helper.in index 69f22e4..4d8fd04 100755 --- a/appliance/libguestfs-supermin-helper.in +++ b/appliance/libguestfs-supermin-helper.in @@ -38,7 +38,13 @@ initrd="$3" # without arch second. arch=$(echo "@host_cpu@" | sed 's/^i.86$/i?86/') -kernels=$(ls -1vr /boot/vmlinuz-*.$arch* 2>/dev/null | grep -v xen; ls -1vr /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 + exit 1 +fi + for f in $kernels; do b=$(basename "$f") b=$(echo "$b" | sed 's,vmlinuz-,,') -- 1.8.3.1