c40d0441ae
- Correct fix for displaying text on emergency consoles (boo#1124088) * removes 0589-Fix-displaying-text-on-emergency-consoles.patch * adds 0589-Fix-98dracut-systemd-dracut-emergency.sh.patch - 95iscsi: handle qedi like bnx2i (bsc#1113712) * adds 0592-95iscsi-handle-qedi-like-bnx2i.patch OBS-URL: https://build.opensuse.org/request/show/674187 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=365
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
From 8095b250d173b0e12f9826e7124c0781086be891 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Molkentin <dmolkentin@suse.com>
|
|
Date: Tue, 12 Feb 2019 16:55:26 +0100
|
|
Subject: [PATCH] 95iscsi: handle qedi like bnx2i
|
|
|
|
The new qedi driver needs to be handled just like
|
|
the bnx2i driver, so update 95iscsi scripts to do this.
|
|
|
|
References: bsc#1113712
|
|
|
|
Signed-off-by: Lee Duncan <lduncan@suse.com>
|
|
---
|
|
modules.d/95iscsi/cleanup-iscsi.sh | 5 +++--
|
|
modules.d/95iscsi/iscsiroot.sh | 9 ++++++---
|
|
2 files changed, 9 insertions(+), 5 deletions(-)
|
|
|
|
Index: dracut-044/modules.d/95iscsi/cleanup-iscsi.sh
|
|
===================================================================
|
|
--- dracut-044.orig/modules.d/95iscsi/cleanup-iscsi.sh
|
|
+++ dracut-044/modules.d/95iscsi/cleanup-iscsi.sh
|
|
@@ -1,4 +1,5 @@
|
|
#!/bin/sh
|
|
|
|
-[ -z "${DRACUT_SYSTEMD}" ] && [ -e /sys/module/bnx2i ] && killproc iscsiuio
|
|
-
|
|
+if [[ -z "${DRACUT_SYSTEMD}" ]] && ( [[ -e /sys/module/bnx2i ]] || [[ -e /sys/module/qedi ]] ) ; then
|
|
+ killproc iscsiuio
|
|
+fi
|
|
Index: dracut-044/modules.d/95iscsi/iscsiroot.sh
|
|
===================================================================
|
|
--- dracut-044.orig/modules.d/95iscsi/iscsiroot.sh
|
|
+++ dracut-044/modules.d/95iscsi/iscsiroot.sh
|
|
@@ -36,9 +36,12 @@ iroot=${iroot#:}
|
|
# figured out a way how to check whether this is built-in or not
|
|
modprobe crc32c 2>/dev/null
|
|
|
|
-if [ -z "${DRACUT_SYSTEMD}" ] && [ -e /sys/module/bnx2i ] && ! [ -e /tmp/iscsiuio-started ]; then
|
|
- iscsiuio
|
|
- > /tmp/iscsiuio-started
|
|
+# start iscsiuio if needed
|
|
+if [[ -z "${DRACUT_SYSTEMD}" ]] && \
|
|
+ ( [[ -e /sys/module/bnx2i ]] || [[ -e /sys/module/qedi ]] ) && \
|
|
+ ! [ -e /tmp/iscsiuio-started ]; then
|
|
+ iscsiuio
|
|
+ > /tmp/iscsiuio-started
|
|
fi
|
|
|
|
#set value for initial login retry
|