bb76751d8a
- Rediff patches to match git repository
- 95fcoe: Check for FCoE devices prior to binaries
* Modify 0055-95fcoe-Only-install-fcoe-module-if-required.patch
- 99base: Install chown instead of chgrp
* Modify 0052-99base-Add-chown-binary.patch
- 95iscsi: do not try to detect iSCSI firmware during booting;
should be handled via commandline parameter
* Modify 0030-95iscsi-Autodetect-iSCSI-firmware.patch
- Rename patch:
* old: 0051-mkinitrd-suse-add-update-booloader-message.patch
new: 0051-mkinitrd-suse-add-update-bootloader-message.patch
OBS-URL: https://build.opensuse.org/request/show/236229
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=157
83 lines
2.4 KiB
Diff
83 lines
2.4 KiB
Diff
From b4d9257babaea468c8ea8510350c30df509e2184 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Fri, 30 May 2014 10:34:03 +0200
|
|
Subject: [PATCH] 95iscsi: update commandline printing
|
|
|
|
dracut has a separate callout 'cmdline' which should be used
|
|
for printing out the generated commandline.
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
modules.d/95iscsi/module-setup.sh | 40 +++++++++++++++++++++++----------------
|
|
1 file changed, 24 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
|
|
index 634c72e..52fac5c 100755
|
|
--- a/modules.d/95iscsi/module-setup.sh
|
|
+++ b/modules.d/95iscsi/module-setup.sh
|
|
@@ -2,6 +2,21 @@
|
|
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
|
# ex: ts=8 sw=4 sts=4 et filetype=sh
|
|
|
|
+install_ibft() {
|
|
+ # When iBFT / iscsi_boot is detected:
|
|
+ # - 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
|
|
+ if [ ${d##*/} = "ibft" ] ; then
|
|
+ echo -n "ip=ibft "
|
|
+ fi
|
|
+ echo -n "rd.iscsi.firmware=1"
|
|
+ fi
|
|
+ done
|
|
+}
|
|
+
|
|
# called by dracut
|
|
check() {
|
|
local _rootdev
|
|
@@ -39,23 +54,11 @@ depends() {
|
|
installkernel() {
|
|
local _arch=$(uname -m)
|
|
|
|
- install_ibft() {
|
|
- # When iBFT / iscsi_boot is detected:
|
|
- # - 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
|
|
- 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
|
|
- }
|
|
-
|
|
# Detect iBFT and perform mandatory steps
|
|
- install_ibft
|
|
+ if [[ $hostonly_cmdline == "yes" ]] ; then
|
|
+ install_ibft > "${initdir}/etc/cmdline.d/95iscsi.conf"
|
|
+ echo >> "${initdir}/etc/cmdline.d/95iscsi.conf"
|
|
+ fi
|
|
|
|
instmods bnx2i qla4xxx cxgb3i cxgb4i be2iscsi
|
|
hostonly="" instmods iscsi_tcp iscsi_ibft crc32c iscsi_boot_sysfs
|
|
@@ -97,6 +100,11 @@ installkernel() {
|
|
}
|
|
|
|
# called by dracut
|
|
+cmdline() {
|
|
+ install_ibft
|
|
+}
|
|
+
|
|
+# called by dracut
|
|
install() {
|
|
inst_multiple umount iscsistart hostname iscsi-iname
|
|
inst_multiple -o iscsiuio
|
|
--
|
|
1.8.4.5
|
|
|