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
57 lines
2.2 KiB
Diff
57 lines
2.2 KiB
Diff
From 75faba5ea84fe53df7d3ca3e4f4b6cf390c824bb Mon Sep 17 00:00:00 2001
|
|
From: Jan Loseser <jloeser@suse.de>
|
|
Date: Thu, 11 Sep 2014 15:20:23 +0200
|
|
Subject: Add SUSE kernel module dependencies (in /etc/modprobe.d/*)
|
|
|
|
bnc#895331
|
|
|
|
CC: Jan Loeser <jloeser@suse.de>
|
|
---
|
|
dracut-functions.sh | 6 +++++-
|
|
dracut.sh | 12 ++++++++++++
|
|
2 files changed, 17 insertions(+), 1 deletions(-)
|
|
|
|
Index: dracut-042/dracut-functions.sh
|
|
===================================================================
|
|
--- dracut-042.orig/dracut-functions.sh 2015-06-24 18:02:29.194501095 +0200
|
|
+++ dracut-042/dracut-functions.sh 2015-06-24 18:02:29.782534571 +0200
|
|
@@ -1740,8 +1740,14 @@ instmods() {
|
|
--set-version $kernel ${_moddirname} $_mpargs
|
|
((_ret+=$?))
|
|
else
|
|
- [[ $DRACUT_KERNEL_LAZY_HASHDIR ]] && \
|
|
+ if [[ $DRACUT_KERNEL_LAZY_HASHDIR ]] \
|
|
+ && [ -n "${_mod%.ko*}" ]; then
|
|
echo ${_mod%.ko*} >> "$DRACUT_KERNEL_LAZY_HASHDIR/lazylist"
|
|
+ for suse_mod_dep in ${suse_mod_deps["${_mod%.ko*}"]}; do
|
|
+ echo $suse_mod_dep >> "$DRACUT_KERNEL_LAZY_HASHDIR/lazylist"
|
|
+ done
|
|
+ fi
|
|
+
|
|
fi
|
|
;;
|
|
esac
|
|
Index: dracut-042/dracut.sh
|
|
===================================================================
|
|
--- dracut-042.orig/dracut.sh 2015-06-24 18:02:29.490517947 +0200
|
|
+++ dracut-042/dracut.sh 2015-06-24 18:02:29.782534571 +0200
|
|
@@ -855,6 +855,18 @@ if [[ -n "$logfile" ]];then
|
|
fi
|
|
fi
|
|
|
|
+# parse SUSE kernel module dependencies
|
|
+# Kernel modules using "load_module" function may not show up in modprobe
|
|
+# depencies. While this is the case there is a workaround in SUSE which adds:
|
|
+# # SUSE_INITRD: module_name REQUIRES module1 module2 ...
|
|
+# to /etc/modprobe.d/*.conf
|
|
+declare -A suse_mod_deps
|
|
+while read -r line; do
|
|
+ _suse_mod="${line##*SUSE INITRD: }"
|
|
+ _suse_mod="${_suse_mod%% REQUIRES*}"
|
|
+ suse_mod_deps["$_suse_mod"]="${suse_mod_deps["$_suse_mod"]} ${line##*REQUIRES }"
|
|
+done <<< "$(grep -h "^# SUSE INITRD: " /etc/modprobe.d/[0-9][0-9]*.conf)"
|
|
+
|
|
# handle compression options.
|
|
[[ $compress ]] || compress="gzip"
|
|
case $compress in
|