|
 |
e88930 |
From 1c3b1d23e0b3f17399ffd4463cafad813b0444d5 Mon Sep 17 00:00:00 2001
|
|
|
e88930 |
From: Chris Leech <cleech@redhat.com>
|
|
|
e88930 |
Date: Wed, 19 Dec 2012 15:07:36 -0800
|
|
|
e88930 |
Subject: update systemd service files, add iscsi.service for starting
|
|
|
e88930 |
sessions on boot
|
|
|
e88930 |
|
|
|
e88930 |
Signed-off-by: Chris Leech <cleech@redhat.com>
|
|
|
e88930 |
---
|
|
|
e88930 |
etc/systemd/iscsi.service | 19 +++++++++++++++++++
|
|
|
e88930 |
etc/systemd/iscsi_mark_root_nodes | 14 ++++++++++++++
|
|
|
e88930 |
etc/systemd/iscsid.service | 7 +++++--
|
|
|
e88930 |
etc/systemd/iscsid.socket | 2 +-
|
|
|
e88930 |
4 files changed, 39 insertions(+), 3 deletions(-)
|
|
|
e88930 |
create mode 100644 etc/systemd/iscsi.service
|
|
|
e88930 |
create mode 100755 etc/systemd/iscsi_mark_root_nodes
|
|
|
e88930 |
|
|
|
e88930 |
diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
|
|
|
e88930 |
new file mode 100644
|
|
|
e88930 |
index 0000000..bbd52fd
|
|
|
e88930 |
--- /dev/null
|
|
|
e88930 |
+++ b/etc/systemd/iscsi.service
|
|
|
e88930 |
@@ -0,0 +1,19 @@
|
|
|
e88930 |
+[Unit]
|
|
|
e88930 |
+Description=Login and scanning of iSCSI devices
|
|
|
e88930 |
+Documentation=man:iscsid(8) man:iscsiadm(8)
|
|
|
e88930 |
+DefaultDependencies=no
|
|
|
e88930 |
+Conflicts=shutdown.target
|
|
|
e88930 |
+After=systemd-remount-fs.service network.target iscsid.service iscsiuio.service
|
|
|
e88930 |
+Before=remote-fs-pre.target
|
|
|
e88930 |
+ConditionPathExists=/etc/iscsi/initiatorname.iscsi
|
|
|
e88930 |
+
|
|
|
e88930 |
+[Service]
|
|
|
e88930 |
+Type=oneshot
|
|
|
e88930 |
+RemainAfterExit=true
|
|
|
e88930 |
+ExecStart=/usr/libexec/iscsi_mark_root_nodes
|
|
|
e88930 |
+ExecStart=/sbin/iscsiadm -m node --loginall=automatic
|
|
|
e88930 |
+ExecStop=/bin/sync
|
|
|
e88930 |
+ExecStop=/sbin/iscsiadm -m node --logoutall=automatic
|
|
|
e88930 |
+
|
|
|
e88930 |
+[Install]
|
|
|
e88930 |
+WantedBy=sysinit.target
|
|
|
e88930 |
diff --git a/etc/systemd/iscsi_mark_root_nodes b/etc/systemd/iscsi_mark_root_nodes
|
|
|
e88930 |
new file mode 100755
|
|
|
e88930 |
index 0000000..c68475c
|
|
|
e88930 |
--- /dev/null
|
|
|
e88930 |
+++ b/etc/systemd/iscsi_mark_root_nodes
|
|
|
e88930 |
@@ -0,0 +1,14 @@
|
|
|
e88930 |
+#!/bin/bash
|
|
|
e88930 |
+
|
|
|
e88930 |
+ISCSIADM=/sbin/iscsiadm
|
|
|
e88930 |
+SESSION_FILE=/run/initramfs/iscsi.sessions
|
|
|
e88930 |
+
|
|
|
e88930 |
+if [ ! -f $SESSION_FILE ] ; then
|
|
|
e88930 |
+ exit 0
|
|
|
e88930 |
+fi
|
|
|
e88930 |
+
|
|
|
e88930 |
+while read t num i target; do
|
|
|
e88930 |
+ ip=${i%:*}
|
|
|
e88930 |
+ $ISCSIADM -m node -p $ip -T $target -o update -n node.startup -v onboot
|
|
|
e88930 |
+done < $SESSION_FILE
|
|
|
e88930 |
+
|
|
|
e88930 |
diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
|
|
|
e88930 |
index 028e0b3..653dd08 100644
|
|
|
e88930 |
--- a/etc/systemd/iscsid.service
|
|
|
e88930 |
+++ b/etc/systemd/iscsid.service
|
|
|
e88930 |
@@ -1,7 +1,10 @@
|
|
|
e88930 |
[Unit]
|
|
|
e88930 |
Description=Open-iSCSI
|
|
|
e88930 |
-Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
|
|
|
e88930 |
-After=network.target NetworkManager-wait-online.service iscsiuio.service tgtd.service targetcli.service
|
|
|
e88930 |
+Documentation=man:iscsid(8) man:iscsiadm(8)
|
|
|
e88930 |
+DefaultDependencies=no
|
|
|
e88930 |
+Conflicts=shutdown.target
|
|
|
e88930 |
+After=network.target iscsiuio.service
|
|
|
e88930 |
+Before=remote-fs-pre.target
|
|
|
e88930 |
|
|
|
e88930 |
[Service]
|
|
|
e88930 |
Type=forking
|
|
|
e88930 |
diff --git a/etc/systemd/iscsid.socket b/etc/systemd/iscsid.socket
|
|
|
e88930 |
index 832451d..58a8d12 100644
|
|
|
e88930 |
--- a/etc/systemd/iscsid.socket
|
|
|
e88930 |
+++ b/etc/systemd/iscsid.socket
|
|
|
e88930 |
@@ -1,6 +1,6 @@
|
|
|
e88930 |
[Unit]
|
|
|
e88930 |
Description=Open-iSCSI iscsid Socket
|
|
|
e88930 |
-Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
|
|
|
e88930 |
+Documentation=man:iscsid(8) man:iscsiadm(8)
|
|
|
e88930 |
|
|
|
e88930 |
[Socket]
|
|
|
e88930 |
ListenStream=@ISCSIADM_ABSTRACT_NAMESPACE
|
|
|
e88930 |
--
|
|
|
e88930 |
1.7.11.7
|
|
|
e88930 |
|