diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2013-06-04 11:34:38 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2013-06-04 11:35:09 +0000 |
| commit | 3fd9b5d2c14b7134f73218248596790fa2c287b2 (patch) | |
| tree | 9faa6b34861059239eaae3d1a1aa18b5341b9afe | |
| parent | f6e99451d47fbe7cdb852f48dd11006808db52ae (diff) | |
| download | aports-3fd9b5d2c14b7134f73218248596790fa2c287b2.tar.bz2 aports-3fd9b5d2c14b7134f73218248596790fa2c287b2.tar.xz | |
main/open-iscsi: don't report error when no targets are configured. Fixes #1526
| -rw-r--r-- | main/open-iscsi/APKBUILD | 10 | ||||
| -rw-r--r-- | main/open-iscsi/iscsid.initd | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/main/open-iscsi/APKBUILD b/main/open-iscsi/APKBUILD index 0a3f56b720..b37759e55f 100644 --- a/main/open-iscsi/APKBUILD +++ b/main/open-iscsi/APKBUILD @@ -2,7 +2,7 @@ pkgname=open-iscsi pkgver=2.0.873 _realver=${pkgver%.*}-${pkgver##*.} -pkgrel=0 +pkgrel=1 pkgdesc="High performance, transport independent, multi-platform iSCSI initiator" url="http://www.open-iscsi.org" arch="all" @@ -40,5 +40,11 @@ package() { } md5sums="8b8316d7c9469149a6cc6234478347f7 open-iscsi-2.0-873.tar.gz -9971f5abe255764ee616566e60955dba iscsid.initd +1462e44ce6ec4ae44ec83d0ffcd3cdda iscsid.initd b762b687d4628791b4362df22cf22d34 iscsid.confd" +sha256sums="7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9 open-iscsi-2.0-873.tar.gz +3bad25eba8254de845e41016df65855673c85a76ff96af713c7eab62c646bb7a iscsid.initd +673bf4744efc3276d372587c996270821d39dcdc0bf27a13691ea6b0e814b6d0 iscsid.confd" +sha512sums="4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b open-iscsi-2.0-873.tar.gz +ac3894a62d27a975c7ec6dbc639e7442d6f1472e4fe0967f813cc78de4a36418fcb584888012f1927a83bb2c73c26f85031cb411d49ba5356772dfd23e426c3f iscsid.initd +075bb9cb783be7ccbc799947e0e042b85310d40b3045141dc1be40ca84ed1cc0e1e54559df501c512c179e28375314b27a03c15d9a6d4b1cabd428b2279985d3 iscsid.confd" diff --git a/main/open-iscsi/iscsid.initd b/main/open-iscsi/iscsid.initd index 8ac8e1d9b5..f7d0a26289 100644 --- a/main/open-iscsi/iscsid.initd +++ b/main/open-iscsi/iscsid.initd @@ -100,6 +100,10 @@ starttargets() { ebegin "Setting up iSCSI targets" /usr/bin/iscsiadm -m node --loginall=automatic ret=$? + #Don't report error when no targets are configured + if [ "$ret" -eq "21" ]; then + ret="0" + fi eend $ret return $ret } |