Merge pull request #1890 from mjg59/iscsi

iSCSI fixes
This commit is contained in:
Matthew Garrett 2016-04-18 15:32:33 -07:00
commit 5063c59023
5 changed files with 22 additions and 2 deletions

View File

@ -89,3 +89,10 @@ net-fs/nfs-utils ~arm64
=net-wireless/wireless-tools-30_pre9 ~arm64
=net-wireless/iw-4.0 **
=net-libs/libmicrohttpd-0.9.44 **
+# required by sys-block/open-iscsi-2.0.873-r1::coreos
+# required by coreos-base/coreos-0.0.1-r266::coreos
+# required by coreos-base/coreos-dev-0.1.0-r75::coreos
+# required by coreos-devel/board-packages-0.0.1-r4::coreos
+# required by coreos-devel/board-packages (argument)
+=sys-fs/lsscsi-0.28 **

View File

@ -0,0 +1,10 @@
# Generate an iSCSI initiator name if one doesn't already exist
[Unit]
Description=iSCSI initiator name generator
After=systemd-tmpfiles-setup.service
ConditionPathExists=!/etc/iscsi/initiatorname.iscsi
DefaultDependencies=no
[Service]
Type=oneshot
ExecStart=/bin/sh -c 'echo InitiatorName=iqn.2016-04.com.coreos.iscsi:$(</etc/machine-id) >/etc/iscsi/initiatorname.iscsi'

View File

@ -1,7 +1,8 @@
[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
After=network.target NetworkManager-wait-online.service iscsid-initiatorname.service iscsiuio.service tgtd.service targetcli.service
Requires=iscsid-initiatorname.service
[Service]
Type=forking

View File

@ -89,8 +89,10 @@ src_install() {
systemd_dounit "${FILESDIR}"/iscsid.service
systemd_dounit "${FILESDIR}"/iscsid.socket
systemd_dounit "${FILESDIR}/iscsid-initiatorname.service
systemd_dotmpfilesd "${FILESDIR}"/open-iscsi.conf
fperms 600 /etc/iscsi/iscsid.conf
rm "${D}"/etc/iscsi/initiatorname.iscsi
mv "${D}"/etc/iscsi "${D}"/usr/share/iscsi
}

View File

@ -11,7 +11,7 @@ SRC_URI="http://christophe.varoqui.free.fr/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
IUSE="systemd"
RDEPEND=">=sys-fs/lvm2-2.02.45