Attachment #181693 for bug #255528

View | Details | Raw Unified | Return to bug 255528 | Differences between
Collapse All | Expand All




++ 1.0.5-dm-crypt-stop.sh

		eend $? "Failed to remove dm-crypt mapping for: ${target}"
	done

	if [ -n "$(/bin/egrep -e '^(source=)./dev/loop*' /etc/conf.d/dmcrypt)" ] ; then
		einfo "Taking down any dm-crypt loop devices"
		/bin/egrep -e "^(source)" /etc/conf.d/dmcrypt | while read sourceline
		do
			source=
			eval ${sourceline}
			case ${source} in */dev/loop*)
				ebegin "   Taking down ${source}"
				/sbin/losetup -d ${source}
				eend $? "  Failed to remove loop"
			;; esac
		done
	fi
fi
++ 1.0.6-r2-dm-crypt-start.sh

dm_crypt_execute_dmcrypt() {
	local dev ret mode foo
	# some colors
	local red='\033[31;01m' green='\033[32;01m' off='\033[0;0m'

	if [ -n "$target" ]; then
		# let user set options, otherwise leave empty

		return
	fi

	if [ -n "${loop_file}" ] ; then
		dev="/dev/mapper/${target}"
		ebegin "  Setting up loop device ${source}"
		/sbin/losetup ${source} ${loop_file}

	# Handle keys
	if [ -n "$key" ]; then
		read_abort() {
			local ans savestty puretext
			printf " ${green}*${off}  %s? (${red}yes${off}/${green}No${off}) " "$1"
			puretext=" *  $1? (yes/No) "
			local ok=true
			shift
			savestty=`stty -g`
			stty -icanon
			if [ "$1" = '-t' ] && [ "$2" -gt 0 ]; then
				stty min 0 time "$(( $2 * 10 ))"
			fi
			ans=`dd count=1 bs=1 2>/dev/null` || ok=false
			stty $savestty
			[ -n "$ans" ] || ok=false
			if ! $ok; then
				local back=""
				ans="$puretext$ans"
				while [ -n "${ans}" ]; do
					back="${back}"'\b'
					ans=${ans%?}
				done
				printf "${back}"
			else
				echo
			fi
			case $ans in
				y*|Y*) return 0;;
				*) return 1;;
			esac
		}

		# Notes: sed not used to avoid case where /usr partition is encrypted.
		mode=${key##*:} && ( [ "$mode" = "$key" ] || [ -z "$mode" ] ) && mode=reg
		key=${key%%:*}
		case "$mode" in
		gpg|reg)
			# handle key on removable device

							&& foo="mount failed" \
							|| foo="mount source not found"
					fi
					i=$(( $i + 1 ))
					read_abort "Stop waiting after $i attempts (${foo})" -t 1 && return
				done
			else    # keyfile ! on removable device

	fi
	ebegin "dm-crypt map ${target}"
	einfo "cryptsetup will be called with : ${options} ${arg1} ${arg2} ${arg3}"
	if [ "$mode" = "gpg" ]; then
		: ${gpg_options:='-q -d'}
		# gpg available ?
		if command -v gpg >/dev/null 2>&1; then
			i=0; while [ $i -lt 3 ]
			do
				# paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected.
				# save stdin stdout stderr "values"
				gpg ${gpg_options} ${key} 2>/dev/null | cryptsetup ${options} ${arg1} ${arg2} ${arg3}
				ret="$?"
				[ "$ret" -eq 0 ] && break
				i=$(( $i + 1 ))
			done
			eend "${ret}" "failure running cryptsetup"
		else

			einfo "If you have /usr on its own partition, try copying gpg to /bin ."
		fi
	else
		if [ "$mode" = "reg" ]; then
			cryptsetup ${options} -d ${key} ${arg1} ${arg2} ${arg3}
			ret="$?"
			eend "${ret}" "failure running cryptsetup"

	fi
	splash svc_input_end ${SVCNAME} >/dev/null 2>&1

	if [ ${ret} -ne 0 ] ; then
		cryptfs_status=1
	else
		if [ -n "${pre_mount}" ] ; then
			dev="/dev/mapper/${target}"
			ebegin "  Running pre_mount commands for ${target}"
			eval "${pre_mount}" > /dev/null

	fi

	mount_point=$(grep "/dev/mapper/${target}" /proc/mounts | cut -d' ' -f2)
	if [ -z "${mount_point}" ] ; then
		ewarn "Failed to find mount point for ${target}, skipping"
		cryptfs_status=1
	fi

	if [ -n "${post_mount}" ] ; then
		ebegin "Running post_mount commands for target ${target}"
		eval "${post_mount}" >/dev/null
		eend $? || cryptfs_status=1

			echo "usage: strlen <variable_name>"
			die
		fi
	local s c
	eval "s=\$$1"
	c=0; while [ -n "$s" ]; do c=$(( $c + 1 )); s=${s%?}; done
	echo $c
}

# Lookup optional bootparams
parse_opt() {
	case "$1" in
		*\=*)
			local key_name=${1%%=*}
			local key_len=`strlen key_name`
			local value_start=$(( $key_len + 2 ))
			echo "$1" | cut -c ${value_start}-
		;;
	esac

	esac
done

if [ -f /etc/conf.d/dmcrypt ] && [ -x /sbin/cryptsetup ] ; then
	ebegin "Setting up dm-crypt mappings"

	# Fix for baselayout-1.12.10 (bug 174256)


	while read targetline ; do
		# skip comments and blank lines
		case ${targetline} in ''|'#'*) continue;; esac

		# check for the start of a new target/swap
		case ${targetline} in

				;;

			gpg_options=*|remdev=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|source=*)
				if [ -z "${target}" ] && [ -z "${swap}" ] ; then
					ewarn "Ignoring setting outside target/swap section: ${targetline}"
					continue
				fi
++ dm-crypt-start.sh

dm-crypt-execute-checkfs() {
	local dev target ret

	if [ -n "${loop_file}" ] ; then
		dev="/dev/mapper/${target}"
		ebegin "  Setting up loop device ${source}"
		/sbin/losetup ${source} ${loop_file} 
	fi

	if [ -n "${mount}" ] ; then
		target=${mount}
		: ${options:='-c aes -h sha1'}
		[ -n "${key}" ] && : ${gpg_options:='-q -d'}
	elif [ -n "${swap}" ] ; then
		target=${swap}
		: ${options:='-c aes -h sha1 -d /dev/urandom'}
		: ${pre_mount:='mkswap ${dev}'}


	splash svc_input_begin checkfs
	ebegin "dm-crypt map ${target}"
	if [ -z "${key}" ] ; then
		/bin/cryptsetup ${options} create ${target} ${source} >/dev/console </dev/console
		ret=$?
		eend ${ret} "failure running cryptsetup"
	else
		if command -v gpg >/dev/null 2>&1; then
			ret=1
			while [ ${ret} -gt 0 ] ; do
				keystring=$(gpg ${gpg_options} ${key} 2>/dev/null </dev/console)
				if [ -z "${keystring}" ] ; then
					ret=5
				else
					echo ${keystring} | /bin/cryptsetup ${options} create ${target} ${source}

	fi
	splash svc_input_end checkfs

	if [ ${ret} -ne 0 ] ; then
		cryptfs_status=1
	else
		if [ -n "${pre_mount}" ] ; then
			dev="/dev/mapper/${target}"
			ebegin "  Running pre_mount commands for ${target}"
			eval "${pre_mount}" > /dev/null

dm-crypt-execute-localmount() {
	local mount_point target

	if [ -n "${mount}" ] && [ -n "${post_mount}" ] ; then
		target=${mount}
	else
		return

	fi

	mount_point=$(grep "/dev/mapper/${target}" /proc/mounts | cut -d' ' -f2)
	if [ -z "${mount_point}" ] ; then
		ewarn "Failed to find mount point for ${target}, skipping"
		cryptfs_status=1
	fi

	if [ -n "${post_mount}" ] ; then
		ebegin "Running post_mount commands for target ${target}"
		eval "${post_mount}" >/dev/null
		eend $? || cryptfs_status=1

local cryptfs_status=0 
local gpg_options key loop_file mount mountline options pre_mount post_mount source swap

if [ -f /etc/conf.d/cryptfs ] && [ -x /bin/cryptsetup ] ; then
	ebegin "Setting up dm-crypt mappings"

	while read mountline ; do
		# skip comments and blank lines
		case ${mountline} in ''|'#'*) continue;; esac

		# check for the start of a new mount/swap
		case ${mountline} in

				;;

			gpg_options=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|source=*)
				if [ -z "${mount}" ] && [ -z "${swap}" ] ; then
					ewarn "Ignoring setting outside mount/swap section: ${mountline}"
					continue
				fi
++ dm-crypt-stop.sh

		eend $? "Failed to remove dm-crypt mapping for: ${target}"
	done

	if [ -n "$(/bin/egrep -e '^(source=)./dev/loop*' /etc/conf.d/cryptfs)" ] ; then
		einfo "Taking down any dm-crypt loop devices"
		/bin/egrep -e "^(source)" /etc/conf.d/cryptfs | while read sourceline
		do
			source=
			eval ${sourceline}
			case ${source} in */dev/loop*)
				ebegin "   Taking down ${source}"
				/sbin/losetup -d ${source}
				eend $? "  Failed to remove loop"
			;; esac
		done
	fi
fi

Return to bug 255528

Line Link Here

(-)file_not_specified_in_diff (-52 / +70 lines)
0	-- 1.0.5-dm-crypt-stop.sh	0	++ 1.0.5-dm-crypt-stop.sh
Lines 22-38 Link Here
22	eend $? "Failed to remove dm-crypt mapping for: ${target}"	22	eend $? "Failed to remove dm-crypt mapping for: ${target}"
23	done	23	done
24		24
25	if [[ -n $(/bin/egrep -e "^(source=)./dev/loop*" /etc/conf.d/dmcrypt) ]] ; then	25	if [ -n "$(/bin/egrep -e '^(source=)./dev/loop*' /etc/conf.d/dmcrypt)" ] ; then
26	einfo "Taking down any dm-crypt loop devices"	26	einfo "Taking down any dm-crypt loop devices"
27	/bin/egrep -e "^(source)" /etc/conf.d/dmcrypt \| while read sourceline	27	/bin/egrep -e "^(source)" /etc/conf.d/dmcrypt \| while read sourceline
28	do	28	do
29	source=	29	source=
30	eval ${sourceline}	30	eval ${sourceline}
31	if [[ -n $(echo ${source} \| grep /dev/loop) ]] ; then	31	case ${source} in /dev/loop)
32	ebegin " Taking down ${source}"	32	ebegin " Taking down ${source}"
33	/sbin/losetup -d ${source}	33	/sbin/losetup -d ${source}
34	eend $? " Failed to remove loop"	34	eend $? " Failed to remove loop"
35	fi	35	;; esac
36	done	36	done
37	fi	37	fi
38	fi	38	fi
39	-- 1.0.6-r2-dm-crypt-start.sh	39	++ 1.0.6-r2-dm-crypt-start.sh
Lines 14-20 Link Here
14	dm_crypt_execute_dmcrypt() {	14	dm_crypt_execute_dmcrypt() {
15	local dev ret mode foo	15	local dev ret mode foo
16	# some colors	16	# some colors
17	local red='\x1b[31;01m' green='\x1b[32;01m' off='\x1b[0;0m'	17	local red='\033[31;01m' green='\033[32;01m' off='\033[0;0m'
18		18
19	if [ -n "$target" ]; then	19	if [ -n "$target" ]; then
20	# let user set options, otherwise leave empty	20	# let user set options, otherwise leave empty
Lines 40-46 Link Here
40	return	40	return
41	fi	41	fi
42		42
43	if [[ -n ${loop_file} ]] ; then	43	if [ -n "${loop_file}" ] ; then
44	dev="/dev/mapper/${target}"	44	dev="/dev/mapper/${target}"
45	ebegin " Setting up loop device ${source}"	45	ebegin " Setting up loop device ${source}"
46	/sbin/losetup ${source} ${loop_file}	46	/sbin/losetup ${source} ${loop_file}
Lines 62-86 Link Here
62	# Handle keys	62	# Handle keys
63	if [ -n "$key" ]; then	63	if [ -n "$key" ]; then
64	read_abort() {	64	read_abort() {
65	local ans	65	local ans savestty puretext
66	local prompt=" ${green}*${off} $1? (${red}yes${off}/${green}No${off}) "	66	printf " ${green}*${off} %s? (${red}yes${off}/${green}No${off}) " "$1"
		67	puretext=" * $1? (yes/No) "
		68	local ok=true
67	shift	69	shift
68	echo -n -e "${prompt}"	70	savestty=`stty -g`
69	if ! read -n 1 $* ans ; then	71	stty -icanon
70	local back=${prompt//?/\\b}	72	if [ "$1" = '-t' ] && [ "$2" -gt 0 ]; then
71	echo -n -e "${back}"	73	stty min 0 time "$(( $2 * 10 ))"
		74	fi
		75	ans=`dd count=1 bs=1 2>/dev/null` \|\| ok=false
		76	stty $savestty
		77	[ -n "$ans" ] \|\| ok=false
		78	if ! $ok; then
		79	local back=""
		80	ans="$puretext$ans"
		81	while [ -n "${ans}" ]; do
		82	back="${back}"'\b'
		83	ans=${ans%?}
		84	done
		85	printf "${back}"
72	else	86	else
73	echo	87	echo
74	fi	88	fi
75	case $ans in	89	case $ans in
76	[yY]\|[yY][eE][sS]) return 0;;	90	y\|Y) return 0;;
77	*) return 1;;	91	*) return 1;;
78	esac	92	esac
79	}	93	}
80		94
81	# Notes: sed not used to avoid case where /usr partition is encrypted.	95	# Notes: sed not used to avoid case where /usr partition is encrypted.
82	mode=${key/*:/} && ( [ "$mode" == "$key" ] \|\| [ -z "$mode" ] ) && mode=reg	96	mode=${key##*:} && ( [ "$mode" = "$key" ] \|\| [ -z "$mode" ] ) && mode=reg
83	key=${key/:*/}	97	key=${key%%:*}
84	case "$mode" in	98	case "$mode" in
85	gpg\|reg)	99	gpg\|reg)
86	# handle key on removable device	100	# handle key on removable device
Lines 114-120 Link Here
114	&& foo="mount failed" \	128	&& foo="mount failed" \
115	\|\| foo="mount source not found"	129	\|\| foo="mount source not found"
116	fi	130	fi
117	((++i))	131	i=$(( $i + 1 ))
118	read_abort "Stop waiting after $i attempts (${foo})" -t 1 && return	132	read_abort "Stop waiting after $i attempts (${foo})" -t 1 && return
119	done	133	done
120	else # keyfile ! on removable device	134	else # keyfile ! on removable device
Lines 136-152 Link Here
136	fi	150	fi
137	ebegin "dm-crypt map ${target}"	151	ebegin "dm-crypt map ${target}"
138	einfo "cryptsetup will be called with : ${options} ${arg1} ${arg2} ${arg3}"	152	einfo "cryptsetup will be called with : ${options} ${arg1} ${arg2} ${arg3}"
139	if [ "$mode" == "gpg" ]; then	153	if [ "$mode" = "gpg" ]; then
140	: ${gpg_options:='-q -d'}	154	: ${gpg_options:='-q -d'}
141	# gpg available ?	155	# gpg available ?
142	if type -p gpg >/dev/null ; then	156	if command -v gpg >/dev/null 2>&1; then
143	for (( i = 0 ; i < 3 ; i++ ))	157	i=0; while [ $i -lt 3 ]
144	do	158	do
145	# paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected.	159	# paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected.
146	# save stdin stdout stderr "values"	160	# save stdin stdout stderr "values"
147	gpg ${gpg_options} ${key} 2>/dev/null \| cryptsetup ${options} ${arg1} ${arg2} ${arg3}	161	gpg ${gpg_options} ${key} 2>/dev/null \| cryptsetup ${options} ${arg1} ${arg2} ${arg3}
148	ret="$?"	162	ret="$?"
149	[ "$ret" -eq 0 ] && break	163	[ "$ret" -eq 0 ] && break
		164	i=$(( $i + 1 ))
150	done	165	done
151	eend "${ret}" "failure running cryptsetup"	166	eend "${ret}" "failure running cryptsetup"
152	else	167	else
Lines 156-162 Link Here
156	einfo "If you have /usr on its own partition, try copying gpg to /bin ."	171	einfo "If you have /usr on its own partition, try copying gpg to /bin ."
157	fi	172	fi
158	else	173	else
159	if [ "$mode" == "reg" ]; then	174	if [ "$mode" = "reg" ]; then
160	cryptsetup ${options} -d ${key} ${arg1} ${arg2} ${arg3}	175	cryptsetup ${options} -d ${key} ${arg1} ${arg2} ${arg3}
161	ret="$?"	176	ret="$?"
162	eend "${ret}" "failure running cryptsetup"	177	eend "${ret}" "failure running cryptsetup"
Lines 172-181 Link Here
172	fi	187	fi
173	splash svc_input_end ${SVCNAME} >/dev/null 2>&1	188	splash svc_input_end ${SVCNAME} >/dev/null 2>&1
174		189
175	if [[ ${ret} != 0 ]] ; then	190	if [ ${ret} -ne 0 ] ; then
176	cryptfs_status=1	191	cryptfs_status=1
177	else	192	else
178	if [[ -n ${pre_mount} ]] ; then	193	if [ -n "${pre_mount}" ] ; then
179	dev="/dev/mapper/${target}"	194	dev="/dev/mapper/${target}"
180	ebegin " Running pre_mount commands for ${target}"	195	ebegin " Running pre_mount commands for ${target}"
181	eval "${pre_mount}" > /dev/null	196	eval "${pre_mount}" > /dev/null
Lines 199-210 Link Here
199	fi	214	fi
200		215
201	mount_point=$(grep "/dev/mapper/${target}" /proc/mounts \| cut -d' ' -f2)	216	mount_point=$(grep "/dev/mapper/${target}" /proc/mounts \| cut -d' ' -f2)
202	if [[ -z ${mount_point} ]] ; then	217	if [ -z "${mount_point}" ] ; then
203	ewarn "Failed to find mount point for ${target}, skipping"	218	ewarn "Failed to find mount point for ${target}, skipping"
204	cryptfs_status=1	219	cryptfs_status=1
205	fi	220	fi
206		221
207	if [[ -n ${post_mount} ]] ; then	222	if [ -n "${post_mount}" ] ; then
208	ebegin "Running post_mount commands for target ${target}"	223	ebegin "Running post_mount commands for target ${target}"
209	eval "${post_mount}" >/dev/null	224	eval "${post_mount}" >/dev/null
210	eend $? \|\| cryptfs_status=1	225	eend $? \|\| cryptfs_status=1
Lines 218-233 Link Here
218	echo "usage: strlen <variable_name>"	233	echo "usage: strlen <variable_name>"
219	die	234	die
220	fi	235	fi
221	eval echo "\${#${1}}"	236	local s c
		237	eval "s=\$$1"
		238	c=0; while [ -n "$s" ]; do c=$(( $c + 1 )); s=${s%?}; done
		239	echo $c
222	}	240	}
223		241
224	# Lookup optional bootparams	242	# Lookup optional bootparams
225	parse_opt() {	243	parse_opt() {
226	case "$1" in	244	case "$1" in
227	\=)	245	\=)
228	local key_name="`echo "$1" \| cut -f1 -d=`"	246	local key_name=${1%%=*}
229	local key_len=`strlen key_name`	247	local key_len=`strlen key_name`
230	local value_start=$((key_len+2))	248	local value_start=$(( $key_len + 2 ))
231	echo "$1" \| cut -c ${value_start}-	249	echo "$1" \| cut -c ${value_start}-
232	;;	250	;;
233	esac	251	esac
Lines 249-255 Link Here
249	esac	267	esac
250	done	268	done
251		269
252	if [[ -f /etc/conf.d/dmcrypt ]] && [[ -x /sbin/cryptsetup ]] ; then	270	if [ -f /etc/conf.d/dmcrypt ] && [ -x /sbin/cryptsetup ] ; then
253	ebegin "Setting up dm-crypt mappings"	271	ebegin "Setting up dm-crypt mappings"
254		272
255	# Fix for baselayout-1.12.10 (bug 174256)	273	# Fix for baselayout-1.12.10 (bug 174256)
Lines 257-263 Link Here
257		275
258	while read targetline ; do	276	while read targetline ; do
259	# skip comments and blank lines	277	# skip comments and blank lines
260	[[ ${targetline}\# == \#* ]] && continue	278	case ${targetline} in ''\|'#'*) continue;; esac
261		279
262	# check for the start of a new target/swap	280	# check for the start of a new target/swap
263	case ${targetline} in	281	case ${targetline} in
Lines 270-276 Link Here
270	;;	288	;;
271		289
272	gpg_options=\|remdev=\|key=\|loop_file=\|options=\|pre_mount=\|post_mount=\|source=)	290	gpg_options=\|remdev=\|key=\|loop_file=\|options=\|pre_mount=\|post_mount=\|source=)
273	if [[ -z ${target} && -z ${swap} ]] ; then	291	if [ -z "${target}" ] && [ -z "${swap}" ] ; then
274	ewarn "Ignoring setting outside target/swap section: ${targetline}"	292	ewarn "Ignoring setting outside target/swap section: ${targetline}"
275	continue	293	continue
276	fi	294	fi
277	-- dm-crypt-start.sh	295	++ dm-crypt-start.sh
Lines 9-25 Link Here
9	dm-crypt-execute-checkfs() {	9	dm-crypt-execute-checkfs() {
10	local dev target ret	10	local dev target ret
11		11
12	if [[ -n ${loop_file} ]] ; then	12	if [ -n "${loop_file}" ] ; then
13	dev="/dev/mapper/${target}"	13	dev="/dev/mapper/${target}"
14	ebegin " Setting up loop device ${source}"	14	ebegin " Setting up loop device ${source}"
15	/sbin/losetup ${source} ${loop_file}	15	/sbin/losetup ${source} ${loop_file}
16	fi	16	fi
17		17
18	if [[ -n ${mount} ]] ; then	18	if [ -n "${mount}" ] ; then
19	target=${mount}	19	target=${mount}
20	: ${options:='-c aes -h sha1'}	20	: ${options:='-c aes -h sha1'}
21	[[ -n ${key} ]] && : ${gpg_options:='-q -d'}	21	[ -n "${key}" ] && : ${gpg_options:='-q -d'}
22	elif [[ -n ${swap} ]] ; then	22	elif [ -n "${swap}" ] ; then
23	target=${swap}	23	target=${swap}
24	: ${options:='-c aes -h sha1 -d /dev/urandom'}	24	: ${options:='-c aes -h sha1 -d /dev/urandom'}
25	: ${pre_mount:='mkswap ${dev}'}	25	: ${pre_mount:='mkswap ${dev}'}
Lines 34-49 Link Here
34		34
35	splash svc_input_begin checkfs	35	splash svc_input_begin checkfs
36	ebegin "dm-crypt map ${target}"	36	ebegin "dm-crypt map ${target}"
37	if [[ -z ${key} ]] ; then	37	if [ -z "${key}" ] ; then
38	/bin/cryptsetup ${options} create ${target} ${source} >/dev/console </dev/console	38	/bin/cryptsetup ${options} create ${target} ${source} >/dev/console </dev/console
39	ret=$?	39	ret=$?
40	eend ${ret} "failure running cryptsetup"	40	eend ${ret} "failure running cryptsetup"
41	else	41	else
42	if type -p gpg >/dev/null ; then	42	if command -v gpg >/dev/null 2>&1; then
43	ret=1	43	ret=1
44	while [[ ${ret} -gt 0 ]] ; do	44	while [ ${ret} -gt 0 ] ; do
45	keystring=$(gpg ${gpg_options} ${key} 2>/dev/null </dev/console)	45	keystring=$(gpg ${gpg_options} ${key} 2>/dev/null </dev/console)
46	if [[ -z ${keystring} ]] ; then	46	if [ -z "${keystring}" ] ; then
47	ret=5	47	ret=5
48	else	48	else
49	echo ${keystring} \| /bin/cryptsetup ${options} create ${target} ${source}	49	echo ${keystring} \| /bin/cryptsetup ${options} create ${target} ${source}
Lines 57-66 Link Here
57	fi	57	fi
58	splash svc_input_end checkfs	58	splash svc_input_end checkfs
59		59
60	if [[ ${ret} != 0 ]] ; then	60	if [ ${ret} -ne 0 ] ; then
61	cryptfs_status=1	61	cryptfs_status=1
62	else	62	else
63	if [[ -n ${pre_mount} ]] ; then	63	if [ -n "${pre_mount}" ] ; then
64	dev="/dev/mapper/${target}"	64	dev="/dev/mapper/${target}"
65	ebegin " Running pre_mount commands for ${target}"	65	ebegin " Running pre_mount commands for ${target}"
66	eval "${pre_mount}" > /dev/null	66	eval "${pre_mount}" > /dev/null
Lines 75-81 Link Here
75	dm-crypt-execute-localmount() {	75	dm-crypt-execute-localmount() {
76	local mount_point target	76	local mount_point target
77		77
78	if [[ -n ${mount} && -n ${post_mount} ]] ; then	78	if [ -n "${mount}" ] && [ -n "${post_mount}" ] ; then
79	target=${mount}	79	target=${mount}
80	else	80	else
81	return	81	return
Lines 88-99 Link Here
88	fi	88	fi
89		89
90	mount_point=$(grep "/dev/mapper/${target}" /proc/mounts \| cut -d' ' -f2)	90	mount_point=$(grep "/dev/mapper/${target}" /proc/mounts \| cut -d' ' -f2)
91	if [[ -z ${mount_point} ]] ; then	91	if [ -z "${mount_point}" ] ; then
92	ewarn "Failed to find mount point for ${target}, skipping"	92	ewarn "Failed to find mount point for ${target}, skipping"
93	cryptfs_status=1	93	cryptfs_status=1
94	fi	94	fi
95		95
96	if [[ -n ${post_mount} ]] ; then	96	if [ -n "${post_mount}" ] ; then
97	ebegin "Running post_mount commands for target ${target}"	97	ebegin "Running post_mount commands for target ${target}"
98	eval "${post_mount}" >/dev/null	98	eval "${post_mount}" >/dev/null
99	eend $? \|\| cryptfs_status=1	99	eend $? \|\| cryptfs_status=1
Lines 103-114 Link Here
103	local cryptfs_status=0	103	local cryptfs_status=0
104	local gpg_options key loop_file mount mountline options pre_mount post_mount source swap	104	local gpg_options key loop_file mount mountline options pre_mount post_mount source swap
105		105
106	if [[ -f /etc/conf.d/cryptfs ]] && [[ -x /bin/cryptsetup ]] ; then	106	if [ -f /etc/conf.d/cryptfs ] && [ -x /bin/cryptsetup ] ; then
107	ebegin "Setting up dm-crypt mappings"	107	ebegin "Setting up dm-crypt mappings"
108		108
109	while read mountline ; do	109	while read mountline ; do
110	# skip comments and blank lines	110	# skip comments and blank lines
111	[[ ${mountline}\# == \#* ]] && continue	111	case ${mountline} in ''\|'#'*) continue;; esac
112		112
113	# check for the start of a new mount/swap	113	# check for the start of a new mount/swap
114	case ${mountline} in	114	case ${mountline} in
Lines 121-127 Link Here
121	;;	121	;;
122		122
123	gpg_options=\|key=\|loop_file=\|options=\|pre_mount=\|post_mount=\|source=*)	123	gpg_options=\|key=\|loop_file=\|options=\|pre_mount=\|post_mount=\|source=*)
124	if [[ -z ${mount} && -z ${swap} ]] ; then	124	if [ -z "${mount}" ] && [ -z "${swap}" ] ; then
125	ewarn "Ignoring setting outside mount/swap section: ${mountline}"	125	ewarn "Ignoring setting outside mount/swap section: ${mountline}"
126	continue	126	continue
127	fi	127	fi
128	-- dm-crypt-stop.sh	128	++ dm-crypt-stop.sh
Lines 32-48 Link Here
32	eend $? "Failed to remove dm-crypt mapping for: ${target}"	32	eend $? "Failed to remove dm-crypt mapping for: ${target}"
33	done	33	done
34		34
35	if [[ -n $(/bin/egrep -e "^(source=)./dev/loop*" /etc/conf.d/cryptfs) ]] ; then	35	if [ -n "$(/bin/egrep -e '^(source=)./dev/loop*' /etc/conf.d/cryptfs)" ] ; then
36	einfo "Taking down any dm-crypt loop devices"	36	einfo "Taking down any dm-crypt loop devices"
37	/bin/egrep -e "^(source)" /etc/conf.d/cryptfs \| while read sourceline	37	/bin/egrep -e "^(source)" /etc/conf.d/cryptfs \| while read sourceline
38	do	38	do
39	source=	39	source=
40	eval ${sourceline}	40	eval ${sourceline}
41	if [[ -n $(echo ${source} \| grep /dev/loop) ]] ; then	41	case ${source} in /dev/loop)
42	ebegin " Taking down ${source}"	42	ebegin " Taking down ${source}"
43	/sbin/losetup -d ${source}	43	/sbin/losetup -d ${source}
44	eend $? " Failed to remove loop"	44	eend $? " Failed to remove loop"
45	fi	45	;; esac
46	done	46	done
47	fi	47	fi
48	fi	48	fi