diff options
| author | Cedric Schieli <cschieli@gmail.com> | 2010-06-01 12:37:47 +0000 |
|---|---|---|
| committer | Cedric Schieli <cschieli@gmail.com> | 2010-06-01 12:37:47 +0000 |
| commit | 10b8b99e48384b4470cac1330080c12d2ade01de (patch) | |
| tree | 7bb4ad6cd94a2c9a960fd9a4532d123eee5151d5 /testing/open-iscsi | |
| parent | 9252f1cfd78299b137400ed8169a79f7f833daac (diff) | |
| parent | c6c0b6f9dbde1244e7b31f74c703178a867e873f (diff) | |
| download | aports-to-upstream.tar.bz2 aports-to-upstream.tar.xz | |
Merge remote branch 'upstream/master' into to-upstreamto-upstream
Diffstat (limited to 'testing/open-iscsi')
| -rw-r--r-- | testing/open-iscsi/APKBUILD | 10 | ||||
| -rw-r--r-- | testing/open-iscsi/iscsid.initd (renamed from testing/open-iscsi/iscsid-2.0.871-r1.init.d) | 5 |
2 files changed, 7 insertions, 8 deletions
diff --git a/testing/open-iscsi/APKBUILD b/testing/open-iscsi/APKBUILD index c74cf269..0f4076e2 100644 --- a/testing/open-iscsi/APKBUILD +++ b/testing/open-iscsi/APKBUILD @@ -2,7 +2,7 @@ pkgname=open-iscsi pkgver=2.0.871 _realver=2.0-871 -pkgrel=0 +pkgrel=2 pkgdesc="High performance, transport independent, multi-platform iSCSI initiator" url="http://www.open-iscsi.org" license="GPL-2" @@ -12,7 +12,8 @@ install="" subpackages="$pkgname-doc" source="http://www.open-iscsi.org/bits/$pkgname-$_realver.tar.gz CVE-2009-1297.patch - open-iscsi-2.0.871-makefile-cleanup.patch" + open-iscsi-2.0.871-makefile-cleanup.patch + iscsid.initd" _builddir="$srcdir"/$pkgname-$_realver @@ -36,9 +37,10 @@ package() { mv $pkgdir/sbin/iscsi_discovery $pkgdir/usr/bin mv $pkgdir/sbin/iscsiadm $pkgdir/usr/bin mv $pkgdir/sbin/iscsid $pkgdir/usr/sbin - install -Dm755 ../../iscsid-2.0.871-r1.init.d "$pkgdir"/etc/init.d/iscsid + install -Dm755 ../../iscsid.initd "$pkgdir"/etc/init.d/iscsid } md5sums="0c403e8c9ad41607571ba0e6e8ff196e open-iscsi-2.0-871.tar.gz d1584790b4e12f087e60089880b53d2b CVE-2009-1297.patch -734300d7b7590dc9ae9b2fb7f5b51bf0 open-iscsi-2.0.871-makefile-cleanup.patch" +734300d7b7590dc9ae9b2fb7f5b51bf0 open-iscsi-2.0.871-makefile-cleanup.patch +3e89cb86395756dafebc4f1490f0de10 iscsid.initd" diff --git a/testing/open-iscsi/iscsid-2.0.871-r1.init.d b/testing/open-iscsi/iscsid.initd index 060eb9b5..572b0a6a 100644 --- a/testing/open-iscsi/iscsid-2.0.871-r1.init.d +++ b/testing/open-iscsi/iscsid.initd @@ -1,7 +1,4 @@ #!/sbin/runscript -# Copyright 1999-2008 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/sys-block/open-iscsi/files/iscsid-2.0.871-r1.init.d,v 1.1 2009/11/12 09:29:48 robbat2 Exp $ opts="${opts} starttargets stoptargets restarttargets" @@ -37,7 +34,7 @@ do_modules() { modopts="$@" for m in ${modules} do - if [ -n "$(modprobe -l | grep ${m})" ] + if [ -n "$(find /lib/modules/`uname -r` | grep ${m})" ] then ebegin "${msg} ${m}" modprobe ${modopts} ${m} |