From 3eefbacff0debc67849c198d43927fdca4d65b52 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Fri, 15 Apr 2016 14:03:19 -0700 Subject: [PATCH] Move open-iscsi configuration out of /etc and add systemd units --- .../sys-block/open-iscsi/files/iscsid.service | 15 +++++++++++++++ .../sys-block/open-iscsi/files/iscsid.socket | 9 +++++++++ .../sys-block/open-iscsi/files/open-iscsi.conf | 2 +- ....0.873.ebuild => open-iscsi-2.0.873-r1.ebuild} | 5 ++++- 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid.service create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid.socket rename sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/{open-iscsi-2.0.873.ebuild => open-iscsi-2.0.873-r1.ebuild} (94%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid.service b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid.service new file mode 100644 index 0000000000..4846340cf0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid.service @@ -0,0 +1,15 @@ +[Unit] +Description=Open-iSCSI +Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8) +After=network.target NetworkManager-wait-online.service iscsiuio.service tgtd.service targetcli.service + +[Service] +Type=forking +PIDFile=/var/run/iscsid.pid +ExecStart=/usr/sbin/iscsid +ExecStartPost=-/sbin/iscsiadm -m node --loginall=automatic +ExecStop=-/sbin/iscsiadm -m node --logoutall=all +ExecStop=/sbin/iscsiadm -k 0 2 + +[Install] +WantedBy=multi-user.target diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid.socket b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid.socket new file mode 100644 index 0000000000..832451d7a0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/iscsid.socket @@ -0,0 +1,9 @@ +[Unit] +Description=Open-iSCSI iscsid Socket +Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8) + +[Socket] +ListenStream=@ISCSIADM_ABSTRACT_NAMESPACE + +[Install] +WantedBy=sockets.target diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi.conf b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi.conf index 63f2a9cc2c..de0024a00b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi.conf +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/files/open-iscsi.conf @@ -1,2 +1,2 @@ d /var/db/iscsi 0700 root root - - - +C /etc/iscsi - - - - /usr/share/iscsi diff --git a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild similarity index 94% rename from sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild index 831f9b575a..fb25238c08 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit versionator linux-info eutils flag-o-matic toolchain-funcs +inherit versionator linux-info eutils flag-o-matic toolchain-funcs systemd MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)" @@ -86,7 +86,10 @@ src_install() { doins "${FILESDIR}"/iscsidev.sh insopts -m0644 + systemd_dounit "${FILESDIR}"/iscsid.service + systemd_dounit "${FILESDIR}"/iscsid.socket systemd_dotmpfilesd "${FILESDIR}"/open-iscsi.conf fperms 600 /etc/iscsi/iscsid.conf + mv "${D}"/etc/iscsi "${D}"/usr/share/iscsi }