Move open-iscsi configuration out of /etc and add systemd units

This commit is contained in:
Matthew Garrett 2016-04-15 14:03:19 -07:00
parent fb13debcb8
commit 3eefbacff0
4 changed files with 29 additions and 2 deletions

View File

@ -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

View File

@ -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

View File

@ -1,2 +1,2 @@
d /var/db/iscsi 0700 root root - -
C /etc/iscsi - - - - /usr/share/iscsi

View File

@ -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
}