diff --git a/add_dracuts_network_params_for_iscsi.patch b/add_dracuts_network_params_for_iscsi.patch new file mode 100644 index 0000000..8f77669 --- /dev/null +++ b/add_dracuts_network_params_for_iscsi.patch @@ -0,0 +1,27 @@ +Index: dracut-037/modules.d/95iscsi/module-setup.sh +=================================================================== +--- dracut-037.orig/modules.d/95iscsi/module-setup.sh 2014-03-19 17:16:08.000000000 +0100 ++++ dracut-037/modules.d/95iscsi/module-setup.sh 2014-04-14 13:40:02.560200357 +0200 +@@ -39,6 +39,22 @@ depends() { + installkernel() { + local _arch=$(uname -m) + ++ install_ibft() { ++ local IBFT_NICS="ethernet" ++ local IBFT_ROOT="/sys/firmware/ibft" ++ ++ # When iBFT is detected: ++ # - mark network as mandatory ++ # - specify firmware booting cmdline parameter ++ if [ -d "${IBFT_ROOT}/${IBFT_NICS}"* ]; then ++ echo "rd.neednet=1" >> "${initdir}/etc/cmdline.d/95iscsi.conf" ++ echo "rd.iscsi.firmware=1" >> "${initdir}/etc/cmdline.d/95iscsi.conf" ++ fi ++ } ++ ++ # Detect iBFT and perform mandatory steps ++ install_ibft ++ + instmods bnx2i qla4xxx cxgb3i cxgb4i be2iscsi + hostonly="" instmods iscsi_tcp iscsi_ibft crc32c iscsi_boot_sysfs + iscsi_module_filter() { diff --git a/dracut.changes b/dracut.changes index 259b914..35e411a 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Apr 14 09:00:26 UTC 2014 - pwieczorkiewicz@suse.com + +- add_dracuts_network_params_for_iscsi.patch: + Add missing dracut's cmdline parameters to make network mandatory + and boot using iBFT when present. Without them iBFT booting does + not work. + ------------------------------------------------------------------- Fri Apr 11 13:07:05 CEST 2014 - hare@suse.de diff --git a/dracut.spec b/dracut.spec index ffb4fe0..8a897ef 100644 --- a/dracut.spec +++ b/dracut.spec @@ -57,6 +57,7 @@ Patch30: 0018-fstab-do-not-mount-and-fsck-from-fstab-if-using-syst.patch Patch31: 0019-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch Patch32: 0020-95udev-rules-Include-correct-sg3_utils-rules.patch Patch33: 0021-90multipath-install-correct-multipath-rules.patch +Patch34: add_dracuts_network_params_for_iscsi.patch BuildRequires: asciidoc BuildRequires: bash BuildRequires: docbook-xsl-stylesheets @@ -118,6 +119,7 @@ NFS, iSCSI, NBD, FCoE with the dracut-network package. %patch31 -p1 %patch32 -p1 %patch33 -p1 +%patch34 -p1 %build %configure\