dracut/0049-95iscsi-Use-ip-ibft-for-ibft-autoconfiguration.patch

41 lines
1.4 KiB
Diff
Raw Normal View History

From a857924cc5eaf57b1f8c6ae469fefa4ee03cf6cf Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 27 May 2014 12:07:35 +0200
Subject: [PATCH] 95iscsi: Use 'ip=ibft' for ibft autoconfiguration
Accepting request 235703 from home:trenn:branches:Base:System - Update to latest git HEAD: commit 0fa5dbedc5b222435f51f7460a81232ee120c4e1 Tue May 20 13:23 Modified dracut_v37_to_HEAD.patch Modified mdraid-setup.patch Modified dracut-install-persistent-rule.patch - Add /etc/dracut.d.conf/01-dist modifications to file instead of writing to it via rpm build section Add 0033-dracut_hostonly_hostonly_cmdline_default.patch Add 0034-suse.conf.example_extend.patch - Cleanup mkinitrd-suse.sh: * Remove hostonly and hostonly-cmdline -> this is done via 01-dist config file now - Always add network module based on modules_setup.sh check() function and not via 01-dist config file Add 0035-always_add_network.patch - Add find to debug binaries - Useful and harmless Add 0036-add_extra_debug_binaries.patch - Fix adding of network modules for s390 (bnc#879302) Add 0037-fix_s390_network_modules_install.patch - Omit resume module on s390(x) - There is no suspend on s390 Add 0039-s390_no_resume_module.patch - Do not wait for swap - This causes trouble with Rudi's autobuild images: Add 0038-remove_waiting_for_swap_dev.patch - Fcoe and ibft fixes (bnc#879038): Add 0041-only_enable_network_if_explicitly_requested.patch Add 0042-ibft_autoconfig_param.patch Add 0043-fcoe_strip_quotes.patch - Print message when starting to update bootloader Add 0044-Add_update_bootloader_msg.patch - ToDo: Pass hostonly variable earlier so that is always avail in check() OBS-URL: https://build.opensuse.org/request/show/235703 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=151
2014-05-28 16:30:59 +00:00
For iBFT autoconfiguration we should be setting 'ip=ibft'
instead of rd.neednet. This should instruct dracut to only
enable the iBFT interfaces and leave the rest alone.
References: bnc#879038
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
modules.d/95iscsi/module-setup.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
Accepting request 235703 from home:trenn:branches:Base:System - Update to latest git HEAD: commit 0fa5dbedc5b222435f51f7460a81232ee120c4e1 Tue May 20 13:23 Modified dracut_v37_to_HEAD.patch Modified mdraid-setup.patch Modified dracut-install-persistent-rule.patch - Add /etc/dracut.d.conf/01-dist modifications to file instead of writing to it via rpm build section Add 0033-dracut_hostonly_hostonly_cmdline_default.patch Add 0034-suse.conf.example_extend.patch - Cleanup mkinitrd-suse.sh: * Remove hostonly and hostonly-cmdline -> this is done via 01-dist config file now - Always add network module based on modules_setup.sh check() function and not via 01-dist config file Add 0035-always_add_network.patch - Add find to debug binaries - Useful and harmless Add 0036-add_extra_debug_binaries.patch - Fix adding of network modules for s390 (bnc#879302) Add 0037-fix_s390_network_modules_install.patch - Omit resume module on s390(x) - There is no suspend on s390 Add 0039-s390_no_resume_module.patch - Do not wait for swap - This causes trouble with Rudi's autobuild images: Add 0038-remove_waiting_for_swap_dev.patch - Fcoe and ibft fixes (bnc#879038): Add 0041-only_enable_network_if_explicitly_requested.patch Add 0042-ibft_autoconfig_param.patch Add 0043-fcoe_strip_quotes.patch - Print message when starting to update bootloader Add 0044-Add_update_bootloader_msg.patch - ToDo: Pass hostonly variable earlier so that is always avail in check() OBS-URL: https://build.opensuse.org/request/show/235703 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=151
2014-05-28 16:30:59 +00:00
diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
index 97e6e81..634c72e 100755
--- a/modules.d/95iscsi/module-setup.sh
+++ b/modules.d/95iscsi/module-setup.sh
@@ -41,12 +41,14 @@ installkernel() {
install_ibft() {
# When iBFT / iscsi_boot is detected:
- # - mark network as mandatory
+ # - Use 'ip=ibft' to set up iBFT network interface
# - specify firmware booting cmdline parameter
for d in /sys/firmware/* ; do
if [ -d ${d}/initiator ] ; then
- echo "rd.neednet=1" >> "${initdir}/etc/cmdline.d/95iscsi.conf"
+ if [ ${d##*/} = "ibft" ] ; then
+ echo "ip=ibft" >> "${initdir}/etc/cmdline.d/95iscsi.conf"
+ fi
echo "rd.iscsi.firmware=1" >> "${initdir}/etc/cmdline.d/95iscsi.conf"
fi
done
--
1.8.4.5