Do not bang directly on /dev/console so we dont break when running under X or something.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.2 x86_64

2 files changed, 388 insertions, 0 deletions

diff --git a/sys-fs/cryptsetup/files/1.0.6-dmcrypt.confd b/sys-fs/cryptsetup/files/1.0.6-dmcrypt.confd
new file mode 100644
index 000000000000..322299c0bb71
--- /dev/null
+++ b/sys-fs/cryptsetup/files/1.0.6-dmcrypt.confd
@@ -0,0 +1,94 @@
+# /etc/conf.d/cryptfs
+
+#--------------------
+# Instructions
+#--------------------
+
+# Note regarding the syntax of this file.  This file is *almost* bash,
+# but each line is evaluated separately.  Separate swaps/targets can be
+# specified.  The init-script which reads this file assumes that a
+# swap= or target= line starts a new section, similar to lilo or grub
+# configuration.
+
+# Note when using gpg keys and /usr on a separate partition, you will
+# have to copy /usr/bin/gpg to /bin/gpg so that it will work properly
+# and ensure that gpg has been compiled statically.
+# See http://bugs.gentoo.org/90482 for more information.
+
+# Note that the init-script which reads this file detects whether your
+# partition is LUKS or not. No mkfs is run unless you specify a makefs
+# option.
+
+# Global options:
+#----------------
+
+# Max number of checks to perform (1 per second)
+#dmcrypt_max_timeout=120
+
+# Arguments:
+#-----------
+# target=<name>                      == Mapping name for partition.
+# swap=<name>                        == Mapping name for swap partition.
+# source='<dev>'                     == Real device for partition.
+# key='</path/to/keyfile>[:<mode>]'  == Fullpath from / or from inside removable media.
+# remdev='<dev>'                     == Device that will be assigned to removable media.
+# gpg_options='<opts>'               == Default are --quiet --decrypt
+# options='<opts>'                   == cryptsetup, for LUKS you can only use --readonly
+# loop_file='<file>'                 == Loopback file.
+# pre_mount='cmds'                   == commands to execute before mounting partition.
+# post_mount='cmds'                  == commands to execute after mounting partition.
+#-----------
+# Supported Modes
+# gpg					== decrypt and pipe key into cryptsetup.
+#						Note: new-line character must not be part of key.
+#						Command to erase \n char: 'cat key | tr -d '\n' > cleanKey'
+
+#--------------------
+# dm-crypt examples
+#--------------------
+
+## swap
+# Swap partitions. These should come first so that no keys make their
+# way into unencrypted swap.
+# If no options are given, they will default to: -c aes -h sha1 -d /dev/urandom
+# If no makefs is given then mkswap will be assumed
+#swap=crypt-swap
+#source='/dev/hda2'
+
+## /home with passphrase
+#target=crypt-home
+#source='/dev/hda5'
+
+## /home with regular keyfile
+#target=crypt-home
+#source='/dev/hda5'
+#key='/full/path/to/homekey'
+
+## /home with gpg protected key
+#target=crypt-home
+#source='/dev/hda5'
+#key='/full/path/to/homekey:gpg'
+
+## /home with regular keyfile on removable media(such as usb-stick)
+#target=crypt-home
+#source='/dev/hda5'
+#key='/full/path/to/homekey'
+#remdev='/dev/sda1'
+
+##/home with gpg protected key on removable media(such as usb-stick)
+#target=crypt-home
+#source='/dev/hda5'
+#key='/full/path/to/homekey:gpg'
+#remdev='/dev/sda1'
+
+##/tmp with regular keyfile
+#target=crypt-tmp
+#source='/dev/hda6'
+#key='/full/path/to/tmpkey'
+#pre_mount='/sbin/mkreiserfs -f -f ${dev}'
+#post_mount='chown root:root ${mount_point}; chmod 1777 ${mount_point}'
+
+## Loopback file example
+#mount='crypt-loop-home'
+#source='/dev/loop0'
+#loop_file='/mnt/crypt/home'
diff --git a/sys-fs/cryptsetup/files/1.0.6-r2-dm-crypt-start.sh b/sys-fs/cryptsetup/files/1.0.6-r2-dm-crypt-start.sh
new file mode 100644
index 000000000000..6fbf7a1e81b1
--- /dev/null
+++ b/sys-fs/cryptsetup/files/1.0.6-r2-dm-crypt-start.sh
@@ -0,0 +1,294 @@
+# /lib/rcscripts/addons/dm-crypt-start.sh
+
+# For backwards compatability with baselayout < 1.13.0
+dm_crypt_execute_checkfs() {
+	dm_crypt_execute_dmcrypt
+}
+
+dm_crypt_execute_volumes() {
+	dm_crypt_execute_dmcrypt
+}
+
+# Setup mappings for an individual target/swap
+# Note: This relies on variables localized in the main body below.
+dm_crypt_execute_dmcrypt() {
+	local dev ret mode foo
+	# some colors
+	local red='\x1b[31;01m' green='\x1b[32;01m' off='\x1b[0;0m'
+
+	if [ -n "$target" ]; then
+		# let user set options, otherwise leave empty
+		: ${options:=' '}
+	elif [ -n "$swap" ]; then
+		einfo "Checking swap is not LUKS"
+		cryptsetup isLuks ${source} 2>/dev/null
+		foo="$?"
+		if [ "${foo}" -eq 0 ]; then
+		ewarn "The swap you have defined is a LUKS partition. Aborting crypt-swap setup."
+		return
+		fi
+		target=${swap}
+		# swap contents do not need to be preserved between boots, luks not required.
+		# suspend2 users should have initramfs's init handling their swap partition either way.
+		: ${options:='-c aes -h sha1 -d /dev/urandom'}
+		: ${pre_mount:='mkswap ${dev}'}
+	else
+		return
+	fi
+	if [ -z "$source" ] && [ ! -e "$source" ]; then
+		ewarn "source \"${source}\" for ${target} missing, skipping..."
+		return
+	fi
+
+	if [[ -n ${loop_file} ]] ; then
+		dev="/dev/mapper/${target}"
+		ebegin "  Setting up loop device ${source}"
+		/sbin/losetup ${source} ${loop_file}
+	fi
+
+	# cryptsetup:
+	# luksOpen <device> <name>      # <device> is $source
+	# create   <name>   <device>    # <name>   is $target
+	local arg1="create" arg2="$target" arg3="$source" luks=0
+
+	cryptsetup isLuks ${source} 2>/dev/null && { arg1="luksOpen"; arg2="$source"; arg3="$target"; luks=1; }
+
+	if /sbin/cryptsetup status ${target} | egrep -q '\<active:' ; then
+		einfo "dm-crypt mapping ${target} is already configured"
+		return
+	fi
+	splash svc_input_begin ${SVCNAME} >/dev/null 2>&1
+
+	# Handle keys
+	if [ -n "$key" ]; then
+		read_abort() {
+			local ans
+			local prompt=" ${green}*${off}  $1? (${red}yes${off}/${green}No${off}) "
+			shift
+			echo -n -e "${prompt}"
+			if ! read -n 1 $* ans ; then
+				local back=${prompt//?/\\b}
+				echo -n -e "${back}"
+			else
+				echo
+			fi
+			case $ans in
+				[yY]|[yY][eE][sS]) 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
+			if [ -n "$remdev" ]; then
+				# temp directory to mount removable device
+				local mntrem="${RC_SVCDIR}/dm-crypt-remdev.$$"
+				if [ ! -d "${mntrem}" ] ; then
+					if ! mkdir -p "${mntrem}" ; then
+						ewarn "${source} will not be decrypted ..."
+						einfo "Reason: Unable to create temporary mount point '${mntrem}'"
+						return
+					fi
+				fi
+				i=0
+				einfo "Please insert removable device for ${target}"
+				while [ ${i} -lt ${dmcrypt_max_timeout:-120} ] ; do
+					foo=""
+					if mount -n -o ro "${remdev}" "${mntrem}" 2>/dev/null >/dev/null ; then
+						# keyfile exists?
+						if [ ! -e "${mntrem}${key}" ]; then
+							umount -n "${mntrem}"
+							rmdir "${mntrem}"
+							einfo "Cannot find ${key} on removable media."
+							read_abort "Abort" ${read_timeout:--t 1} && return
+						else
+							key="${mntrem}${key}"
+							break
+						fi
+					else
+						[ -e "${remdev}" ] \
+							&& foo="mount failed" \
+							|| foo="mount source not found"
+					fi
+					((++i))
+					read_abort "Stop waiting after $i attempts (${foo})" -t 1 && return
+				done
+			else    # keyfile ! on removable device
+				if [ ! -e "$key" ]; then
+					ewarn "${source} will not be decrypted ..."
+					einfo "Reason: keyfile ${key} does not exist."
+					return
+				fi
+			fi
+			;;
+		*)
+			ewarn "${source} will not be decrypted ..."
+			einfo "Reason: mode ${mode} is invalid."
+			return
+			;;
+		esac
+	else
+		mode=none
+	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 type -p gpg >/dev/null ; then
+			for (( i = 0 ; i < 3 ; i++ ))
+			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
+			done
+			eend "${ret}" "failure running cryptsetup"
+		else
+			ewarn "${source} will not be decrypted ..."
+			einfo "Reason: cannot find gpg application."
+			einfo "You have to install app-crypt/gnupg first."
+			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"
+		else
+			cryptsetup ${options} ${arg1} ${arg2} ${arg3}
+			ret="$?"
+			eend "${ret}" "failure running cryptsetup"
+		fi
+	fi
+	if [ -d "$mntrem" ]; then
+		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
+
+	if [[ ${ret} != 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
+			ewend $? || cryptfs_status=1
+		fi
+	fi
+}
+
+# Run any post_mount commands for an individual mount
+#
+# Note: This relies on variables localized in the main body below.
+dm_crypt_execute_localmount() {
+	local mount_point
+
+	[ -z "$target" ] && [ -z "$post_mount" ] && return
+
+	if ! /sbin/cryptsetup status ${target} | egrep -q '\<active:' ; then
+		ewarn "Skipping unmapped target ${target}"
+		cryptfs_status=1
+		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
+	fi
+}
+
+# Determine string lengths
+strlen() {
+	if [ -z "$1" ]
+		then
+			echo "usage: strlen <variable_name>"
+			die
+		fi
+	eval echo "\${#${1}}"
+}
+
+# Lookup optional bootparams
+parse_opt() {
+	case "$1" in
+		*\=*)
+			local key_name="`echo "$1" | cut -f1 -d=`"
+			local key_len=`strlen key_name`
+			local value_start=$((key_len+2))
+			echo "$1" | cut -c ${value_start}-
+		;;
+	esac
+}
+
+local cryptfs_status=0
+local gpg_options key loop_file target targetline options pre_mount post_mount source swap remdev
+
+CMDLINE="`cat /proc/cmdline`"
+for x in ${CMDLINE}
+do
+	case "${x}" in
+		key_timeout\=*)
+			KEY_TIMEOUT=`parse_opt "${x}"`
+			if [ ${KEY_TIMEOUT} -gt 0 ]; then
+				read_timeout="-t ${KEY_TIMEOUT}"
+			fi
+		;;
+	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)
+	[ -z ${SVCNAME} ] && SVCNAME="${myservice}"
+
+	while read targetline ; do
+		# skip comments and blank lines
+		[[ ${targetline}\# == \#* ]] && continue
+
+		# check for the start of a new target/swap
+		case ${targetline} in
+			target=*|swap=*)
+				# If we have a target queued up, then execute it
+				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
+				;;
+
+			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
+				;;
+
+			*)
+				ewarn "Skipping invalid line in /etc/conf.d/dmcrypt: ${targetline}"
+				;;
+		esac
+
+		# Queue this setting for the next call to dm_crypt_execute_${SVCNAME}
+		eval "${targetline}"
+	done < /etc/conf.d/dmcrypt
+
+	# If we have a target queued up, then execute it
+	dm_crypt_execute_${SVCNAME}
+
+	ewend ${cryptfs_status} "Failed to setup dm-crypt devices"
+fi
+
+# vim:ts=4