diff options
| author |   Matthew Thode <prometheanfire@gentoo.org> | 2015-08-08 05:42:15 +0000 |
|---|---|---|
| committer | Matthew Thode <prometheanfire@gentoo.org> | 2015-08-08 05:42:15 +0000 |
| commit | 3a45d27d1282c8a471af1609f46a93c8125b5e0e (patch) | |
| tree | 1e46ed2d2570b899e1c0184e27a9918d0ab69665 /sys-block | |
| parent | Disable failing EncodingTest::testDifferencesEncoding. (diff) | |
| download | gentoo-2-3a45d27d1282c8a471af1609f46a93c8125b5e0e.tar.gz gentoo-2-3a45d27d1282c8a471af1609f46a93c8125b5e0e.tar.bz2 gentoo-2-3a45d27d1282c8a471af1609f46a93c8125b5e0e.zip | |
fixing bug 511064 and bug 501996
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
Diffstat (limited to 'sys-block')
| -rw-r--r-- | sys-block/open-iscsi/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-block/open-iscsi/files/iscsid-init.d | 6 | ||||
| -rw-r--r-- | sys-block/open-iscsi/open-iscsi-2.0.873.ebuild | 12 |
3 files changed, 18 insertions, 6 deletions
diff --git a/sys-block/open-iscsi/ChangeLog b/sys-block/open-iscsi/ChangeLog index 32ea1053ef96..df860f6b5c97 100644 --- a/sys-block/open-iscsi/ChangeLog +++ b/sys-block/open-iscsi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-block/open-iscsi # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.63 2015/08/06 03:09:28 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.64 2015/08/08 05:42:15 prometheanfire Exp $ + + 08 Aug 2015; Matthew Thode <prometheanfire@gentoo.org> files/iscsid-init.d, + open-iscsi-2.0.873.ebuild: + fixing bug 511064 and bug 501996 06 Aug 2015; Matthew Thode <prometheanfire@gentoo.org> files/iscsidev.sh, open-iscsi-2.0.872-r3.ebuild: diff --git a/sys-block/open-iscsi/files/iscsid-init.d b/sys-block/open-iscsi/files/iscsid-init.d index b42deba5ddfc..a1503394a677 100644 --- a/sys-block/open-iscsi/files/iscsid-init.d +++ b/sys-block/open-iscsi/files/iscsid-init.d @@ -1,11 +1,11 @@ #!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation, Inc. +# Copyright 1999-2015 Gentoo Foundation, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/files/iscsid-init.d,v 1.8 2013/10/20 20:19:52 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/files/iscsid-init.d,v 1.9 2015/08/08 05:42:15 prometheanfire Exp $ command="/usr/sbin/iscsid" command_args="${OPTS}" -start_stop_daemon_args="-w 10" # iscsid might fail e.g. when the iSCSI kernel modules aren't available +start_stop_daemon_args="-w 100" # iscsid might fail e.g. when the iSCSI kernel modules aren't available pidfile=${PIDFILE:-/var/run/${SVCNAME}.pid} extra_started_commands="starttargets stoptargets" diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild index 4d96259e0017..bb2af2c36b5c 100644 --- a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild +++ b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild,v 1.1 2013/10/11 20:08:09 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild,v 1.2 2015/08/08 05:42:15 prometheanfire Exp $ EAPI=5 @@ -19,6 +19,8 @@ IUSE="debug slp" DEPEND="slp? ( net-libs/openslp )" RDEPEND="${DEPEND} + virtual/udev + sys-fs/lsscsi sys-apps/util-linux" S="${WORKDIR}/${MY_PV}" @@ -75,7 +77,13 @@ src_install() { docinto test/ dodoc test/* + insinto /etc/iscsi newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example + # udev pieces + insinto /etc/udev/scripts + doins "${FILESDIR}"/iscsidev.sh + insinto /lib/udev/rules.d + doins "${FILESDIR}"/99-iscsi.rules newconfd "${FILESDIR}"/iscsid-conf.d iscsid newinitd "${FILESDIR}"/iscsid-init.d iscsid |