* [gentoo-commits] gentoo-x86 commit in sys-fs/cryptsetup/files: dmcrypt.rc
@ 2011-11-13 4:18 Mike Frysinger (vapier)
0 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger (vapier) @ 2011-11-13 4:18 UTC (permalink / raw
To: gentoo-commits
vapier 11/11/13 04:18:38
Added: dmcrypt.rc
Log:
Version bump #363521 by Attila Jecs. Rewrite init.d script to only work with openrc. Tweak init.d for splash support #386563 by Tim Ruffing, and make a bit more POSIX compliant #255528 by Martin Väth.
(Portage version: 2.2.0_alpha74/cvs/Linux x86_64)
Revision Changes Path
1.1 sys-fs/cryptsetup/files/dmcrypt.rc
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc?rev=1.1&content-type=text/plain
Index: dmcrypt.rc
===================================================================
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc,v 1.1 2011/11/13 04:18:38 vapier Exp $
depend() {
before checkfs fsck
}
# We support multiple dmcrypt instances based on $SVCNAME
execute_hook="dm_crypt_execute_dmcrypt"
# XXX: Should we drop this ?
# execute_hook="dm_crypt_execute_localmount"
conf_file="/etc/conf.d/${SVCNAME}"
# Get splash helpers if available.
if [ -e /sbin/splash-functions.sh ] ; then
. /sbin/splash-functions.sh
fi
# 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
if [ -n "${target}" ] ; then
# let user set options, otherwise leave empty
: ${options:=' '}
elif [ -n "${swap}" ] ; then
if cryptsetup isLuks ${source} 2>/dev/null ; 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}"
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; }
# Older versions reported:
# ${target} is active:
# Newer versions report:
# ${target} is active[ and is in use.]
if cryptsetup status ${target} | egrep -q ' is 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() {
# some colors
local red='\x1b[31;01m' green='\x1b[32;01m' off='\x1b[0;0m'
local ans
local prompt=" ${green}*${off} $1? (${red}yes${off}/${green}No${off}) "
shift
[ -z "${NORMAL}" ] && eval $(eval_ecolors)
einfon " $1? (${WARN}yes${NORMAL}/${GOOD}No${NORMAL}) "
if ! read -n 1 $* ans ; then
printf '\r'
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 += 1))
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 " ${target} using: ${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 += 1 )) ; 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} -ne 0 ] ; then
cryptfs_status=1
else
if [ -n "${pre_mount}" ] ; then
dev="/dev/mapper/${target}"
ebegin " pre_mount: ${pre_mount}"
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 ! 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
}
# Lookup optional bootparams
get_bootparam_val() {
# We're given something like:
# foo=bar=cow
# Return the "bar=cow" part.
case $1 in
*\=*)
local key=$(echo "$1" | cut -f1 -d=)
echo "$1" | cut -c $(( ${#key} + 2 ))
;;
esac
}
start() {
local header=true cryptfs_status=0
local gpg_options key loop_file target targetline options pre_mount post_mount source swap remdev
local x
for x in $(cat /proc/cmdline) ; do
case "${x}" in
key_timeout\=*)
local KEY_TIMEOUT=$(get_bootparam_val "${x}")
if [ ${KEY_TIMEOUT} -gt 0 ] ; then
read_timeout="-t ${KEY_TIMEOUT}"
fi
;;
esac
done
while read -u 3 targetline ; do
case ${targetline} in
# skip comments and blank lines
""|"#"*) continue ;;
# skip service-specific openrc configs #377927
rc_*) continue ;;
esac
${header} && ebegin "Setting up dm-crypt mappings"
header=false
# check for the start of a new target/swap
case ${targetline} in
target=*|swap=*)
# If we have a target queued up, then execute it
${execute_hook}
# 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}${swap}" ] ; then
ewarn "Ignoring setting outside target/swap section: ${targetline}"
continue
fi
;;
dmcrypt_max_timeout=*)
# ignore global options
continue
;;
*)
ewarn "Skipping invalid line in ${conf_file}: ${targetline}"
;;
esac
# Queue this setting for the next call to dm_crypt_execute_xxx
eval "${targetline}"
done 3< ${conf_file}
# If we have a target queued up, then execute it
${execute_hook}
ewend ${cryptfs_status} "Failed to setup dm-crypt devices"
}
stop() {
local line header
# Break down all mappings
header=true
egrep "^(target|swap)=" ${conf_file} | \
while read line ; do
${header} && einfo "Removing dm-crypt mappings"
header=false
target= swap=
eval ${line}
[ -n "${swap}" ] && target=${swap}
if [ -z "${target}" ] ; then
ewarn "invalid line in ${conf_file}: ${line}"
continue
fi
ebegin " ${target}"
cryptsetup remove ${target}
eend $?
done
# Break down loop devices
header=true
grep '^source=./dev/loop' ${conf_file} | \
while read line ; do
${header} && einfo "Detaching dm-crypt loop devices"
header=false
source=
eval ${line}
ebegin " ${source}"
losetup -d "${source}"
eend $?
done
return 0
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/cryptsetup/files: dmcrypt.rc
@ 2011-11-20 23:32 Mike Frysinger (vapier)
0 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger (vapier) @ 2011-11-20 23:32 UTC (permalink / raw
To: gentoo-commits
vapier 11/11/20 23:32:22
Modified: dmcrypt.rc
Log:
Drop dead prompt code.
(Portage version: 2.2.0_alpha75/cvs/Linux x86_64)
Revision Changes Path
1.2 sys-fs/cryptsetup/files/dmcrypt.rc
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc?r1=1.1&r2=1.2
Index: dmcrypt.rc
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dmcrypt.rc 13 Nov 2011 04:18:38 -0000 1.1
+++ dmcrypt.rc 20 Nov 2011 23:32:22 -0000 1.2
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc,v 1.1 2011/11/13 04:18:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc,v 1.2 2011/11/20 23:32:22 vapier Exp $
depend() {
before checkfs fsck
@@ -71,9 +71,7 @@
if [ -n "${key}" ] ; then
read_abort() {
# some colors
- local red='\x1b[31;01m' green='\x1b[32;01m' off='\x1b[0;0m'
local ans
- local prompt=" ${green}*${off} $1? (${red}yes${off}/${green}No${off}) "
shift
[ -z "${NORMAL}" ] && eval $(eval_ecolors)
einfon " $1? (${WARN}yes${NORMAL}/${GOOD}No${NORMAL}) "
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/cryptsetup/files: dmcrypt.rc
@ 2012-05-11 8:18 Mike Frysinger (vapier)
0 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger (vapier) @ 2012-05-11 8:18 UTC (permalink / raw
To: gentoo-commits
vapier 12/05/11 08:18:10
Modified: dmcrypt.rc
Log:
Use POSIX compliant for loop #408117 by Maxim Kammerer.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Revision Changes Path
1.3 sys-fs/cryptsetup/files/dmcrypt.rc
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc?r1=1.2&r2=1.3
Index: dmcrypt.rc
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dmcrypt.rc 20 Nov 2011 23:32:22 -0000 1.2
+++ dmcrypt.rc 11 May 2012 08:18:10 -0000 1.3
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc,v 1.2 2011/11/20 23:32:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc,v 1.3 2012/05/11 08:18:10 vapier Exp $
depend() {
before checkfs fsck
@@ -147,7 +147,7 @@
: ${gpg_options:='-q -d'}
# gpg available ?
if type -p gpg >/dev/null ; then
- for (( i = 0 ; i < 3 ; i += 1 )) ; do
+ for i in 0 1 2 ; 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}
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/cryptsetup/files: dmcrypt.rc
@ 2012-05-11 8:33 Mike Frysinger (vapier)
0 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger (vapier) @ 2012-05-11 8:33 UTC (permalink / raw
To: gentoo-commits
vapier 12/05/11 08:33:01
Modified: dmcrypt.rc
Log:
Version bump #412795 by Manuel Rüger (mrueg). Replace `read -t` with stty hacks by Martin Väth #255528.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Revision Changes Path
1.4 sys-fs/cryptsetup/files/dmcrypt.rc
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc?r1=1.3&r2=1.4
Index: dmcrypt.rc
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dmcrypt.rc 11 May 2012 08:18:10 -0000 1.3
+++ dmcrypt.rc 11 May 2012 08:33:01 -0000 1.4
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc,v 1.3 2012/05/11 08:18:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc,v 1.4 2012/05/11 08:33:01 vapier Exp $
depend() {
before checkfs fsck
@@ -71,17 +71,26 @@
if [ -n "${key}" ] ; then
read_abort() {
# some colors
- local ans
- shift
+ local ans savetty resettty
[ -z "${NORMAL}" ] && eval $(eval_ecolors)
einfon " $1? (${WARN}yes${NORMAL}/${GOOD}No${NORMAL}) "
- if ! read -n 1 $* ans ; then
+ shift
+ # This is ugly as s**t. But POSIX doesn't provide `read -t`, so
+ # we end up having to implement our own crap with stty/etc...
+ savetty=$(stty -g)
+ resettty='stty ${savetty}; trap - EXIT HUP INT TERM'
+ trap 'eval "${resettty}"' EXIT HUP INT TERM
+ stty -icanon
+ [ "${1}" = -t ] && stty min 0 time "$(( $2 * 10 ))"
+ ans=$(dd count=1 bs=1 2>/dev/null) || ans=''
+ eval "${resettty}"
+ if [ -z "${ans}" ] ; then
printf '\r'
else
echo
fi
case ${ans} in
- [yY]|[yY][eE][sS]) return 0;;
+ [yY]) return 0;;
*) return 1;;
esac
}
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-05-11 8:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-11 8:18 [gentoo-commits] gentoo-x86 commit in sys-fs/cryptsetup/files: dmcrypt.rc Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2012-05-11 8:33 Mike Frysinger (vapier)
2011-11-20 23:32 Mike Frysinger (vapier)
2011-11-13 4:18 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox