From: Kairui Song <kasong@redhat.com>
Date: Fri, 29 Nov 2019 13:29:58 +0000 (+0800)
Subject: 95iscsi: Fix /etc/iscsi installation
X-Git-Tag: 050~73
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4598b5540eab8e9371567ec82f18153beb160388;p=thirdparty%2Fdracut.git

95iscsi: Fix /etc/iscsi installation

Previous all files are installed with inst_dir, which will not install
the files under /etc/iscsi/, and it create folders with the same of the
files which is wrong.

Now only use inst_dir to install the config dir and ensure it
exists, and use inst_multiple to install the config files.

Signed-off-by: Kairui Song <kasong@redhat.com>
---

diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
index b7f07d042..b172828d4 100755
--- a/modules.d/95iscsi/module-setup.sh
+++ b/modules.d/95iscsi/module-setup.sh
@@ -228,7 +228,8 @@ install() {
         $systemdsystemunitdir/sockets.target.wants/iscsiuio.socket
 
     if [[ $hostonly ]]; then
-        inst_dir $(/usr/bin/find /etc/iscsi)
+        inst_dir /etc/iscsi
+        inst_multiple $(find /etc/iscsi -type f)
     else
         inst_simple /etc/iscsi/iscsid.conf
     fi