Thomas Renninger
9f28177407
- Update to dracut mainline version 041. Half of the patches got integrated mainline. Some others have been merged together when it made sense some have been left out, but are still in the repository as they need some special treating and mainline discussion whether/how they get added. These are also not urgently needed, but are debugging patches. I broke the rule here to mention every added/deleted/modified patch as every patch is touched and every 2nd got removed (mainline integrated). I also re-ordered the patches in the PatchXY: area for easier merging them and get them discussed and posted mainline easier, topic by topic. OBS-URL: https://build.opensuse.org/request/show/293267 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=214
68 lines
2.2 KiB
Diff
68 lines
2.2 KiB
Diff
From 3c4d4b2c9654e418d422b80e052bdf6d9a02a188 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Renninger <trenn@suse.de>
|
|
Date: Tue, 15 Jul 2014 15:53:23 +0200
|
|
Subject: mkinitrd-suse.sh: Bail out with exit 1 if initrd cannot be generated
|
|
|
|
bnc#886630
|
|
|
|
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
|
---
|
|
mkinitrd-suse.sh | 17 ++++++++++++++++-
|
|
1 file changed, 16 insertions(+), 1 deletion(-)
|
|
|
|
Index: dracut-041/mkinitrd-suse.sh
|
|
===================================================================
|
|
--- dracut-041.orig/mkinitrd-suse.sh 2015-01-31 12:54:52.000000000 +0100
|
|
+++ dracut-041/mkinitrd-suse.sh 2015-03-17 17:42:12.198799273 +0100
|
|
@@ -280,7 +280,8 @@
|
|
|
|
[[ $targets && $kernels ]] || default_kernel_images
|
|
if [[ ! $targets || ! $kernels ]];then
|
|
- error "No kernel found in $boot_dir"
|
|
+ error "No kernel found in $boot_dir or bad modules dir in /lib/modules"
|
|
+ exit 1
|
|
fi
|
|
|
|
# We can have several targets/kernels, transform the list to an array
|
|
@@ -301,6 +302,8 @@
|
|
[[ $domu_module_list ]] || domu_module_list="${DOMU_INITRD_MODULES}"
|
|
shopt -s extglob
|
|
|
|
+failed=""
|
|
+
|
|
for ((i=0 ; $i<${#targets[@]} ; i++)); do
|
|
|
|
if [[ $img_vers ]];then
|
|
@@ -329,14 +332,18 @@
|
|
# expansion magics
|
|
if [ -n "${modules_all}" ];then
|
|
$dracut_cmd $dracut_args --force-drivers "${modules_all}" "$target" "$kernel" &>/dev/null
|
|
+ [ $? -ne 0 ] && failed="$failed $target"
|
|
else
|
|
$dracut_cmd $dracut_args "$target" "$kernel" &>/dev/null
|
|
+ [ $? -ne 0 ] && failed="$failed $target"
|
|
fi
|
|
else
|
|
if [ -n "${modules_all}" ];then
|
|
$dracut_cmd $dracut_args --force-drivers "${modules_all}" "$target" "$kernel"
|
|
+ [ $? -ne 0 ] && failed="$failed $target"
|
|
else
|
|
$dracut_cmd $dracut_args "$target" "$kernel"
|
|
+ [ $? -ne 0 ] && failed="$failed $target"
|
|
fi
|
|
fi
|
|
done
|
|
@@ -345,4 +352,12 @@
|
|
echo 2>&1 "Did not refresh the bootloader. You might need to refresh it manually."
|
|
else
|
|
update-bootloader --refresh
|
|
+ [ $? -ne 0 ] && echo "Updating bootloader failed" && exit 1
|
|
+fi
|
|
+
|
|
+if [ "$failed" != "" ]; then
|
|
+ echo "Generating $failed targets failed"
|
|
+ exit 1
|
|
fi
|
|
+
|
|
+exit 0
|