2014-04-09 12:44:32 +00:00
|
|
|
From 6e2410d3e9403b030125e8d7f523de341466d658 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Thomas Renninger <trenn@suse.de>
|
|
|
|
|
Date: Mon, 7 Apr 2014 16:23:49 +0200
|
|
|
|
|
Subject: [PATCH] mkinitrd-suse: do not update bootloader if no kernel was
|
|
|
|
|
found
|
|
|
|
|
|
|
|
|
|
When no kernel is found mkinitrd-suse should exit without updating the
|
|
|
|
|
bootloader.
|
|
|
|
|
|
|
|
|
|
References: bnc#858268
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
|
|
|
---
|
|
|
|
|
mkinitrd-suse.sh | 4 +++-
|
|
|
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/mkinitrd-suse.sh b/mkinitrd-suse.sh
|
|
|
|
|
index d20270a..b31ea36 100755
|
|
|
|
|
--- a/mkinitrd-suse.sh
|
|
|
|
|
+++ b/mkinitrd-suse.sh
|
2014-01-31 13:51:58 +00:00
|
|
|
@@ -291,7 +291,9 @@ while (($# > 0)); do
|
2014-01-13 18:00:03 +00:00
|
|
|
done
|
|
|
|
|
|
|
|
|
|
[[ $targets && $kernels ]] || default_kernel_images
|
|
|
|
|
-[[ $targets && $kernels ]] || (error "No kernel found in $boot_dir" && usage)
|
2014-01-14 14:14:01 +00:00
|
|
|
+if [[ ! $targets || ! $kernels ]];then
|
|
|
|
|
+ error "No kernel found in $boot_dir"
|
|
|
|
|
+fi
|
2014-01-13 18:00:03 +00:00
|
|
|
|
|
|
|
|
# We can have several targets/kernels, transform the list to an array
|
|
|
|
|
targets=( $targets )
|
2014-04-09 12:44:32 +00:00
|
|
|
--
|
|
|
|
|
1.8.1.4
|
|
|
|
|
|
