iscsi/iscsiroot.sh: do not mount manually in systemd mode

diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
index aa6c6ecebfdfcf0ad74301215fdadc5783bcf90a..0c042198597d4ef0754e24c4f814ed6bb354d69c 100755 (executable)
--- a/modules.d/95iscsi/iscsiroot.sh
+++ b/modules.d/95iscsi/iscsiroot.sh
@@ -145,7 +145,8 @@ handle_netroot()
         wait_for_dev /dev/root
 
         # install mount script
-        echo "iscsi_lun=$iscsi_lun . /bin/mount-lun.sh " > $hookdir/mount/01-$$-iscsi.sh
+        [ -z "$DRACUT_SYSTEMD" ] && \
+            echo "iscsi_lun=$iscsi_lun . /bin/mount-lun.sh " > $hookdir/mount/01-$$-iscsi.sh
     fi
 
     # force udevsettle to break

diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
index f06c783e2e19e943c05d70ad9745764dc272e4fd..1910a33d34d5e2d9146bd14a65fa772586122975 100755 (executable)
--- a/modules.d/95iscsi/module-setup.sh
+++ b/modules.d/95iscsi/module-setup.sh
@@ -78,6 +78,8 @@ install() {
     inst_hook cmdline 90 "$moddir/parse-iscsiroot.sh"
     inst_hook cleanup 90 "$moddir/cleanup-iscsi.sh"
     inst "$moddir/iscsiroot.sh" "/sbin/iscsiroot"
-    inst "$moddir/mount-lun.sh" "/bin/mount-lun.sh"
+    if ! dracut_module_included "systemd"; then
+        inst "$moddir/mount-lun.sh" "/bin/mount-lun.sh"
+    fi
     dracut_need_initqueue
 }