Improved rcscripts patch

dmcrypt-rc.patch (text/plain), 2.70 KB, created by Wolfram on 2010-09-29 04:01:27 UTC

diff -u a/dm-crypt-start.sh b/dm-crypt-start.sh
--- a/dm-crypt-start.sh	2010-09-29 10:53:29.671132396 +0700
+++ b/dm-crypt-start.sh	2010-09-29 11:00:59.740229397 +0700
@@ -249,7 +249,7 @@
 	esac
 done
 
-if [[ -f /etc/conf.d/dmcrypt ]] && [[ -x /sbin/cryptsetup ]] ; then
+if [[ -f /etc/conf.d/${SVCNAME} ]] && [[ -x /sbin/cryptsetup ]] ; then
 	ebegin "Setting up dm-crypt mappings"
 
 	# Fix for baselayout-1.12.10 (bug 174256)
@@ -263,7 +263,7 @@
 		case ${targetline} in
 			target=*|swap=*)
 				# If we have a target queued up, then execute it
-				dm_crypt_execute_${SVCNAME}
+				dm_crypt_execute_${SVCNAME%.*}
 
 				# Prepare for the next target/swap by resetting variables
 				unset gpg_options key loop_file target options pre_mount post_mount source swap remdev
@@ -277,16 +277,16 @@
 				;;
 
 			*)
-				ewarn "Skipping invalid line in /etc/conf.d/dmcrypt: ${targetline}"
+				ewarn "Skipping invalid line in /etc/conf.d/${SVCNAME}: ${targetline}"
 				;;
 		esac
 
-		# Queue this setting for the next call to dm_crypt_execute_${SVCNAME}
+		# Queue this setting for the next call to dm_crypt_execute_${SVCNAME%.*}
 		eval "${targetline}"
-	done 3< /etc/conf.d/dmcrypt
+	done 3< /etc/conf.d/${SVCNAME}
 
 	# If we have a target queued up, then execute it
-	dm_crypt_execute_${SVCNAME}
+	dm_crypt_execute_${SVCNAME%.*}
 
 	ewend ${cryptfs_status} "Failed to setup dm-crypt devices"
 fi
diff -u a/dm-crypt-stop.sh b/dm-crypt-stop.sh
--- a/dm-crypt-stop.sh	2010-09-29 10:53:29.684115145 +0700
+++ b/dm-crypt-stop.sh	2010-09-29 11:02:03.828104305 +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}