From 3172bc0ef3d5ca89145a0a23746438a93680da17 Mon Sep 17 00:00:00 2001
From: Xunlei Pang <xlpang@redhat.com>
Date: Wed, 6 Sep 2017 14:44:47 +0800
Subject: [PATCH] module-setup: remove software iscsi cmdline generated by
 dracut

After adding "--hostonly-cmdline", besides 99kdump, 95iscsi
also generates iscsi related cmdline. IOW, we have duplicate
software iscsi cmdlines.

95iscsi generated software iscsi cmdline doesn't work, so we
remove that of 95iscsi and use that of 99kdump which has been
well tested.

We can change to use 95iscsi when possible in the future.

Signed-off-by: Xunlei Pang <xlpang@redhat.com>
Acked-by: Dave Young <dyoung@redhat.com>
---
 dracut-module-setup.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index ae13337..25bbbe7 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -555,6 +555,10 @@ kdump_setup_iscsi_device() {
         return
     fi
 
+    # Remove software iscsi cmdline generated by 95iscsi,
+    # and let kdump regenerate here.
+    rm -f ${initdir}/etc/cmdline.d/95iscsi.conf
+
     tgt_name=$(kdump_iscsi_get_rec_val ${path} "node.name")
     tgt_ipaddr=$(kdump_iscsi_get_rec_val ${path} "node.conn\[0\].address")