Thomas Renninger
89f9350d9e
- Fix dmraid issue bnc#905746 A dracut_dmraid_use_udev.patch - Taken over from SLE12 A fips_add_aesni-intel.patch - Do not touch /run vs /var/run bnc#922676 D 0106-dracut-Enable-converting-of-directory-var-run-var-lo.patch - Update dracut to version 042 Remove these already included or unneeded patches: D dracut_v041_to_HEAD.patch D 0011-Correct-paths-for-openSUSE.patch D 0068-95fcoe-uefi-Test-for-EFI-firmware.patch D 0170-enable-logitech-hidpp.patch Adjust/refresh: M 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch M 0016-Add-new-s390x-specific-rule-files.patch M 0017-45ifcfg-use-distro-specific-scripts.patch M 0019-40network-Fix-race-condition-when-wait-for-networks.patch M 0020-00warpclock-Set-correct-timezone.patch M 0021-95dcssblk-Add-new-module-for-DCSS-block-devices.patch M 0048-40network-Only-enable-network-interfaces-if-explicit.patch M 0053-01fips-fixup-loading-issues.patch M 0056-81cio_ignore-handle-cio_ignore-commandline.patch M 0057-01fips-Include-some-more-hmacs.patch M 0058-dracut-add-warning-when-including-unsupported-module.patch M 0059-99suse-Add-SUSE-specific-initrd-parsing.patch M 0060-45ifcfg-Add-SUSE-specific-write-ifcfg-file.patch M 0061-45ifcfg-Fixup-error-message-in-write-ifcfg-suse.patch M 0066-40network-always-start-netroot-in-ifup.sh.patch M 0075-95dasd_rules-enable-parsing-of-rd.dasd-commandline-p.patch M 0076-Correctly-set-cio_ignore-for-dynamic-s390-rules.patch OBS-URL: https://build.opensuse.org/request/show/314510 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=219
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-042/mkinitrd-suse.sh
|
|
===================================================================
|
|
--- dracut-042.orig/mkinitrd-suse.sh 2015-06-11 17:39:47.000000000 +0200
|
|
+++ dracut-042/mkinitrd-suse.sh 2015-06-24 18:02:21.618069777 +0200
|
|
@@ -280,7 +280,8 @@ done
|
|
|
|
[[ $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 @@ fi
|
|
[[ $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 @@ for ((i=0 ; $i<${#targets[@]} ; i++)); d
|
|
# 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 @@ if [ "$skip_update_bootloader" ] ; then
|
|
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
|