|
 |
61c4978 |
From 0a5fd0dcec3f6fd49626fed0cac4e89cd1ad3453 Mon Sep 17 00:00:00 2001
|
|
|
61c4978 |
From: Harald Hoyer <harald@redhat.com>
|
|
|
61c4978 |
Date: Thu, 14 Mar 2013 17:54:36 +0100
|
|
|
61c4978 |
Subject: [PATCH] iscsi/iscsiroot.sh: do not mount manually in systemd mode
|
|
|
61c4978 |
|
|
|
61c4978 |
---
|
|
|
61c4978 |
modules.d/95iscsi/iscsiroot.sh | 3 ++-
|
|
|
61c4978 |
modules.d/95iscsi/module-setup.sh | 4 +++-
|
|
|
61c4978 |
2 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
61c4978 |
|
|
|
61c4978 |
diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
|
|
|
61c4978 |
index aa6c6ec..0c04219 100755
|
|
|
61c4978 |
--- a/modules.d/95iscsi/iscsiroot.sh
|
|
|
61c4978 |
+++ b/modules.d/95iscsi/iscsiroot.sh
|
|
|
61c4978 |
@@ -145,7 +145,8 @@ handle_netroot()
|
|
|
61c4978 |
wait_for_dev /dev/root
|
|
|
61c4978 |
|
|
|
61c4978 |
# install mount script
|
|
|
61c4978 |
- echo "iscsi_lun=$iscsi_lun . /bin/mount-lun.sh " > $hookdir/mount/01-$$-iscsi.sh
|
|
|
61c4978 |
+ [ -z "$DRACUT_SYSTEMD" ] && \
|
|
|
61c4978 |
+ echo "iscsi_lun=$iscsi_lun . /bin/mount-lun.sh " > $hookdir/mount/01-$$-iscsi.sh
|
|
|
61c4978 |
fi
|
|
|
61c4978 |
|
|
|
61c4978 |
# force udevsettle to break
|
|
|
61c4978 |
diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
|
|
|
61c4978 |
index f06c783..1910a33 100755
|
|
|
61c4978 |
--- a/modules.d/95iscsi/module-setup.sh
|
|
|
61c4978 |
+++ b/modules.d/95iscsi/module-setup.sh
|
|
|
61c4978 |
@@ -78,6 +78,8 @@ install() {
|
|
|
61c4978 |
inst_hook cmdline 90 "$moddir/parse-iscsiroot.sh"
|
|
|
61c4978 |
inst_hook cleanup 90 "$moddir/cleanup-iscsi.sh"
|
|
|
61c4978 |
inst "$moddir/iscsiroot.sh" "/sbin/iscsiroot"
|
|
|
61c4978 |
- inst "$moddir/mount-lun.sh" "/bin/mount-lun.sh"
|
|
|
61c4978 |
+ if ! dracut_module_included "systemd"; then
|
|
|
61c4978 |
+ inst "$moddir/mount-lun.sh" "/bin/mount-lun.sh"
|
|
|
61c4978 |
+ fi
|
|
|
61c4978 |
dracut_need_initqueue
|
|
|
61c4978 |
}
|