Fixed version of start script patch

dm-crypt-start.patch (text/plain), 2.01 KB, created by Wolfram on 2010-09-27 05:43:52 UTC

--- /lib/rcscripts/addons/dm-crypt-start.sh	2010-09-03 00:02:40.676508413 +0700
+++ /opt/dmc/dm-crypt-start.sh	2010-09-27 12:19:17.667436685 +0700
@@ -57,7 +57,7 @@
 		einfo "dm-crypt mapping ${target} is already configured"
 		return
 	fi
-	splash svc_input_begin ${SVCNAME} >/dev/null 2>&1
+	splash svc_input_begin ${SVCNAME%.*} >/dev/null 2>&1
 
 	# Handle keys
 	if [ -n "$key" ]; then
@@ -170,7 +170,7 @@
 		umount -n ${mntrem} 2>/dev/null >/dev/null
 		rmdir ${mntrem} 2>/dev/null >/dev/null
 	fi
-	splash svc_input_end ${SVCNAME} >/dev/null 2>&1
+	splash svc_input_end ${SVCNAME%.*} >/dev/null 2>&1
 
 	if [[ ${ret} != 0 ]] ; then
 		cryptfs_status=1
@@ -249,11 +249,11 @@
 	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)
-	[ -z ${SVCNAME} ] && SVCNAME="${myservice}"
+	[ -z ${SVCNAME%.*} ] && SVCNAME="${myservice}"
 
 	while read -u 3 targetline ; do
 		# skip comments and blank lines
@@ -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