From 214deaf94fc840b4fda95e348767fae96ecb9091 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 23 May 2011 13:22:27 +0000
Subject: main/open-iscsi: do not unload kernel modules when stopping service

ref #653
---
 main/open-iscsi/APKBUILD     | 4 ++--
 main/open-iscsi/iscsid.initd | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'main')

diff --git a/main/open-iscsi/APKBUILD b/main/open-iscsi/APKBUILD
index e2e92d812..a06795af2 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 572b0a6ae..fdc19c5cf 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() {
-- 
cgit v1.2.3