Fixed version of stop script patch

dm-crypt-stop.patch (text/plain), 1.31 KB, created by Wolfram on 2010-09-27 05:44:33 UTC

--- /lib/rcscripts/addons/dm-crypt-stop.sh	2010-09-03 00:02:40.700571445 +0700
+++ /opt/dmc/dm-crypt-stop.sh	2010-09-27 12:19:17.664458073 +0700
@@ -2,11 +2,11 @@
 
 # Try to remove any dm-crypt mappings
 csetup=/sbin/cryptsetup
-if [ -f /etc/conf.d/dmcrypt ] && [ -x "$csetup" ]
+if [ -f /etc/conf.d/${SVCNAME} ] && [ -x "$csetup" ]
 then
 	einfo "Removing dm-crypt mappings"
 
-	/bin/egrep "^(target|swap)" /etc/conf.d/dmcrypt | \
+	/bin/egrep "^(target|swap)" /etc/conf.d/${SVCNAME} | \
 	while read targetline
 	do
 		target=
@@ -15,16 +15,16 @@
 		eval ${targetline}
 
 		[ -n "${swap}" ] && target=${swap}
-		[ -z "${target}" ] && ewarn "Invalid line in /etc/conf.d/dmcrypt: ${targetline}"
+		[ -z "${target}" ] && ewarn "Invalid line in /etc/conf.d/${SVCNAME}: ${targetline}"
 
 		ebegin "Removing dm-crypt mapping for: ${target}"
 		${csetup} remove ${target}
 		eend $? "Failed to remove dm-crypt mapping for: ${target}"
 	done
 
-	if [[ -n $(/bin/egrep -e "^(source=)./dev/loop*" /etc/conf.d/dmcrypt) ]] ; then
+	if [[ -n $(/bin/egrep -e "^(source=)./dev/loop*" /etc/conf.d/${SVCNAME}) ]] ; then
 		einfo "Taking down any dm-crypt loop devices"
-		/bin/egrep -e "^(source)" /etc/conf.d/dmcrypt | while read sourceline
+		/bin/egrep -e "^(source)" /etc/conf.d/${SVCNAME} | while read sourceline
 		do
 			source=
 			eval ${sourceline}