]>
Commit | Line | Data |
---|---|---|
ad30503e MT |
1 | From 1c3b1d23e0b3f17399ffd4463cafad813b0444d5 Mon Sep 17 00:00:00 2001 |
2 | From: Chris Leech <cleech@redhat.com> | |
3 | Date: Wed, 19 Dec 2012 15:07:36 -0800 | |
4 | Subject: update systemd service files, add iscsi.service for starting | |
5 | sessions on boot | |
6 | ||
7 | Signed-off-by: Chris Leech <cleech@redhat.com> | |
8 | --- | |
9 | etc/systemd/iscsi.service | 19 +++++++++++++++++++ | |
10 | etc/systemd/iscsi_mark_root_nodes | 14 ++++++++++++++ | |
11 | etc/systemd/iscsid.service | 7 +++++-- | |
12 | etc/systemd/iscsid.socket | 2 +- | |
13 | 4 files changed, 39 insertions(+), 3 deletions(-) | |
14 | create mode 100644 etc/systemd/iscsi.service | |
15 | create mode 100755 etc/systemd/iscsi_mark_root_nodes | |
16 | ||
17 | diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service | |
18 | new file mode 100644 | |
19 | index 0000000..bbd52fd | |
20 | --- /dev/null | |
21 | +++ b/etc/systemd/iscsi.service | |
22 | @@ -0,0 +1,19 @@ | |
23 | +[Unit] | |
24 | +Description=Login and scanning of iSCSI devices | |
25 | +Documentation=man:iscsid(8) man:iscsiadm(8) | |
26 | +DefaultDependencies=no | |
27 | +Conflicts=shutdown.target | |
28 | +After=systemd-remount-fs.service network.target iscsid.service iscsiuio.service | |
29 | +Before=remote-fs-pre.target | |
30 | +ConditionPathExists=/etc/iscsi/initiatorname.iscsi | |
31 | + | |
32 | +[Service] | |
33 | +Type=oneshot | |
34 | +RemainAfterExit=true | |
35 | +ExecStart=/usr/libexec/iscsi_mark_root_nodes | |
36 | +ExecStart=/sbin/iscsiadm -m node --loginall=automatic | |
37 | +ExecStop=/bin/sync | |
38 | +ExecStop=/sbin/iscsiadm -m node --logoutall=automatic | |
39 | + | |
40 | +[Install] | |
41 | +WantedBy=sysinit.target | |
42 | diff --git a/etc/systemd/iscsi_mark_root_nodes b/etc/systemd/iscsi_mark_root_nodes | |
43 | new file mode 100755 | |
44 | index 0000000..c68475c | |
45 | --- /dev/null | |
46 | +++ b/etc/systemd/iscsi_mark_root_nodes | |
47 | @@ -0,0 +1,14 @@ | |
48 | +#!/bin/bash | |
49 | + | |
50 | +ISCSIADM=/sbin/iscsiadm | |
51 | +SESSION_FILE=/run/initramfs/iscsi.sessions | |
52 | + | |
53 | +if [ ! -f $SESSION_FILE ] ; then | |
54 | + exit 0 | |
55 | +fi | |
56 | + | |
57 | +while read t num i target; do | |
58 | + ip=${i%:*} | |
59 | + $ISCSIADM -m node -p $ip -T $target -o update -n node.startup -v onboot | |
60 | +done < $SESSION_FILE | |
61 | + | |
62 | diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service | |
63 | index 028e0b3..653dd08 100644 | |
64 | --- a/etc/systemd/iscsid.service | |
65 | +++ b/etc/systemd/iscsid.service | |
66 | @@ -1,7 +1,10 @@ | |
67 | [Unit] | |
68 | Description=Open-iSCSI | |
69 | -Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8) | |
70 | -After=network.target NetworkManager-wait-online.service iscsiuio.service tgtd.service targetcli.service | |
71 | +Documentation=man:iscsid(8) man:iscsiadm(8) | |
72 | +DefaultDependencies=no | |
73 | +Conflicts=shutdown.target | |
74 | +After=network.target iscsiuio.service | |
75 | +Before=remote-fs-pre.target | |
76 | ||
77 | [Service] | |
78 | Type=forking | |
79 | diff --git a/etc/systemd/iscsid.socket b/etc/systemd/iscsid.socket | |
80 | index 832451d..58a8d12 100644 | |
81 | --- a/etc/systemd/iscsid.socket | |
82 | +++ b/etc/systemd/iscsid.socket | |
83 | @@ -1,6 +1,6 @@ | |
84 | [Unit] | |
85 | Description=Open-iSCSI iscsid Socket | |
86 | -Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8) | |
87 | +Documentation=man:iscsid(8) man:iscsiadm(8) | |
88 | ||
89 | [Socket] | |
90 | ListenStream=@ISCSIADM_ABSTRACT_NAMESPACE | |
91 | -- | |
92 | 1.7.11.7 | |
93 |