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
72 lines
2.3 KiB
Diff
72 lines
2.3 KiB
Diff
From 3e2e526a74cdad48d40a1ec58dac9f709d8fef0e Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Thu, 26 Jun 2014 10:50:43 +0200
|
|
Subject: 95dasd_rules: print out 'rd.dasd' commandline
|
|
|
|
When a DASD is found to be required for the rootfs we should
|
|
be printing out a 'rd.dasd' commandline parameter. This not
|
|
only enables us to correctly enable the device with cio_ignore,
|
|
we can also inspect the resulting initrd to figure out which
|
|
devices are required to mount the rootfs.
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
modules.d/95dasd_rules/module-setup.sh | 33 +++++++++++++++++++++++++++++++++
|
|
1 file changed, 33 insertions(+)
|
|
|
|
Index: dracut-042/modules.d/95dasd_rules/module-setup.sh
|
|
===================================================================
|
|
--- dracut-042.orig/modules.d/95dasd_rules/module-setup.sh 2015-06-24 18:02:06.297197575 +0200
|
|
+++ dracut-042/modules.d/95dasd_rules/module-setup.sh 2015-06-24 18:02:10.881458552 +0200
|
|
@@ -1,10 +1,39 @@
|
|
#!/bin/bash
|
|
|
|
# called by dracut
|
|
+cmdline() {
|
|
+ is_dasd() {
|
|
+ local _dev=$1
|
|
+ local _devpath=$(cd -P /sys/dev/block/$_dev ; echo $PWD)
|
|
+
|
|
+ [ "${_devpath#*/dasd}" == "$_devpath" ] && return 1
|
|
+ _ccw="${_devpath%%/block/*}"
|
|
+ echo "rd.dasd=${_ccw##*/}"
|
|
+ return 0
|
|
+ }
|
|
+ [[ $hostonly ]] || [[ $mount_needs ]] && {
|
|
+ for_each_host_dev_and_slaves is_dasd || return 255
|
|
+ }
|
|
+}
|
|
+
|
|
+# called by dracut
|
|
check() {
|
|
local _arch=$(uname -m)
|
|
+ local found=0
|
|
+ local bdev
|
|
[ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1
|
|
require_binaries /usr/lib/udev/collect || return 1
|
|
+
|
|
+ [[ $hostonly ]] || [[ $mount_needs ]] && {
|
|
+ for bdev in /sys/block/* ; do
|
|
+ case "${bdev##*/}" in
|
|
+ dasd*)
|
|
+ found=$(($found+1));
|
|
+ break;
|
|
+ esac
|
|
+ done
|
|
+ [ $found -eq 0 ] && return 255
|
|
+ }
|
|
return 0
|
|
}
|
|
|
|
@@ -17,6 +46,10 @@ depends() {
|
|
# called by dracut
|
|
install() {
|
|
inst_hook cmdline 30 "$moddir/parse-dasd.sh"
|
|
+ if [[ $hostonly_cmdline == "yes" ]] ; then
|
|
+ local _dasd=$(cmdline)
|
|
+ [[ $_dasd ]] && printf "%s\n" "$_dasd" >> "${initdir}/etc/cmdline.d/95dasd.conf"
|
|
+ fi
|
|
if [[ $hostonly ]] ; then
|
|
inst_rules_wildcard 51-dasd-*.rules
|
|
inst_rules_wildcard 41-s390x-dasd-*.rules
|