aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-05-23 13:22:27 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-05-23 13:22:27 +0000
commit214deaf94fc840b4fda95e348767fae96ecb9091 (patch)
tree8d3dbb7e78a401dcf36d418308405020dd937043
parentd1e2ffbc7620ce7ab8ac6e6cb6bea8d3f4fe2dbb (diff)
downloadaports-214deaf94fc840b4fda95e348767fae96ecb9091.tar.bz2
aports-214deaf94fc840b4fda95e348767fae96ecb9091.tar.xz
main/open-iscsi: do not unload kernel modules when stopping service
ref #653
-rw-r--r--main/open-iscsi/APKBUILD4
-rw-r--r--main/open-iscsi/iscsid.initd8
2 files changed, 6 insertions, 6 deletions
diff --git a/main/open-iscsi/APKBUILD b/main/open-iscsi/APKBUILD
index e2e92d812f..a06795af2d 100644
--- a/main/open-iscsi/APKBUILD
+++ b/main/open-iscsi/APKBUILD
@@ -2,7 +2,7 @@
pkgname=open-iscsi
pkgver=2.0.872
_realver=${pkgver%.*}-${pkgver##*.}
-pkgrel=1
+pkgrel=2
pkgdesc="High performance, transport independent, multi-platform iSCSI initiator"
url="http://www.open-iscsi.org"
arch="all"
@@ -40,5 +40,5 @@ package() {
}
md5sums="b4df94f08c241352bb964043b3e44779 open-iscsi-2.0-872.tar.gz
-3e89cb86395756dafebc4f1490f0de10 iscsid.initd
+95cc696720bb9f267f38ac69d5c2e07c iscsid.initd
b762b687d4628791b4362df22cf22d34 iscsid.confd"
diff --git a/main/open-iscsi/iscsid.initd b/main/open-iscsi/iscsid.initd
index 572b0a6ae5..fdc19c5cf7 100644
--- a/main/open-iscsi/iscsid.initd
+++ b/main/open-iscsi/iscsid.initd
@@ -84,16 +84,16 @@ start() {
}
stop() {
+ local ret=
stoptargets
ebegin "Stopping ${SVCNAME}"
start-stop-daemon --signal HUP --stop --quiet --exec /usr/sbin/iscsid #--pidfile $PID_FILE
- eend $?
+ ret=$?
+ eend $ret
# ugly, but pid file is not removed by iscsid
rm -f $PID_FILE
-
- do_modules 'Removing iSCSI modules' 'iscsi_tcp scsi_transport_iscsi libiscsi' '-r'
- eend $?
+ return $ret
}
starttargets() {