From bdbd00932c322b6f77dca30633c259f3959c40f0 Mon Sep 17 00:00:00 2001 From: lars Date: Mon, 15 Oct 2007 23:50:20 +0000 Subject: [PATCH] test removed --- test/cryptdisks | 228 ---------------------------------- test/dmcrypt-wrapper.sh | 73 ----------- test/exec_crypt_or_timeout.sh | 22 ---- 3 files changed, 323 deletions(-) delete mode 100755 test/cryptdisks delete mode 100755 test/dmcrypt-wrapper.sh delete mode 100755 test/exec_crypt_or_timeout.sh diff --git a/test/cryptdisks b/test/cryptdisks deleted file mode 100755 index bb99f96..0000000 --- a/test/cryptdisks +++ /dev/null @@ -1,228 +0,0 @@ -#! /bin/sh -# -# cryptodisks Now that all block devices should be available, setup -# encrypted block devices -# -# this script was slightly modified by age-at-systemausfall-dot-org, -# it now also executes mount commands. search for "MODED". -# it probably won't work with losetup (just devmapper)! - -CRYPTCMD=/sbin/cryptsetup -DEVMAPCMD=/sbin/dmsetup -TABFILE=/etc/crypttab -MAPPER=/dev/mapper - -test -x $CRYPTCMD || exit 0 -test -x $DEVMAPCMD || exit 0 -test -f $TABFILE || exit 0 - -[ -r /etc/default/cryptdisks ] && . /etc/default/cryptdisks - -case "$CRYPTDISKS_ENABLE" in - [Nn]*) - exit 0 - ;; -esac - -$DEVMAPCMD mknodes - -case "$1" in -start) - echo -n "Starting crypto disks:" - egrep -v "^[[:space:]]*(#|$)" $TABFILE | while read dst src key opt; do - echo -ne "\n\t $dst" - if [ -b $MAPPER/$dst ]; then - ### test if mapped but not mounted (probably wrong passphrase) - if [ `mount | grep -c /dev/mapper/$dst` -lt 1 ]; then - echo -n " (removing)" - $CRYPTCMD remove $dst - else - echo -n " (running)" - fi - fi - if [ ! -b $MAPPER/$dst ]; then - ### - #else - echo -n " (starting)" - if [ "x$key" != "x" ] && [ "x$key" != "xnone" ]; then - INTERACTIVE="no" - if test -e "$key" ; then - MODE=`ls -l $key | sed 's/^....\(......\).*/\1/'` - OWNER=`ls -l $key | sed 's/^[^ ]* *[^ ]* *\([^ ]*\).*/\1/'` - if test "$MODE" != "------" && \ - test "$key" != "/dev/urandom" && \ - test "$key" != "/dev/hwrandom" && \ - test "$key" != "/dev/random"; then - echo " - INSECURE MODE FOR $key" >&2 - fi - if test $OWNER != root; then - echo " - INSECURE OWNER FOR $key" >&2 - fi - else - echo " - Keyfile for $dst not found, skipping" >&2 - continue - fi - else - INTERACTIVE="yes" - echo "..." - fi - - PARAMS="" - MAKESWAP="" - MAKETMP="" - SKIP="" - - # Parse the options field, convert to cryptsetup parameters - # and contruct the command line - while test "x$opt" != "x" ; do - ARG=`echo $opt | sed "s/,.*//"` - opt=${opt##$ARG} - opt=${opt##,} - PARAM=`echo $ARG | sed "s/=.*//"` - VALUE=${ARG##$PARAM=} - - case "$PARAM" in - readonly) - PARAM=-r - VALUE="" - ;; - cipher) - PARAM=-c - if test "x$VALUE" = "x" ; then - echo " - no value for cipher option, skipping" >&2 - SKIP="yes" - fi - ;; - size) - PARAM=-s - if test "x$VALUE" = "x" ; then - echo " - no value for size option, skipping" >&2 - SKIP="yes" - fi - ;; - hash) - PARAM=-h - if test "x$VALUE" = "x" ; then - echo " - no value for hash option, skipping" >&2 - SKIP=yes - fi - ;; - verify) - PARAM=-y - VALUE="" - ;; - swap) - MAKESWAP=yes - PARAM="" - VALUE="" - ;; - tmp) - MAKETMP=yes - PARAM="" - VALUE="" - esac - PARAMS="$PARAMS $PARAM $VALUE" - done - - # Set up loopback devices - if test -f "$src" ; then - test -d /sys/block/loop0 || modprobe loop || SKIP=yes - LOOP_ID= - for i in 0 1 2 3 4 5 6 7 ; do - if test "x`cat /sys/block/loop$i/size`" = "x0" ; then - LOOP_ID=$i - break - fi - done - if test "x$LOOP_ID" = "x" ; then - SKIP=yes - else - losetup /dev/loop$LOOP_ID $src || SKIP=yes - src=/dev/loop$LOOP_ID - fi - fi - - if test "x$SKIP" = "xyes" ; then - continue - fi - - if test "x$INTERACTIVE" = "xyes" ; then - if [ -e $src ];then - $CRYPTCMD $PARAMS create $dst $src <&1 - else - echo -en "\t\t$src not found" - fi - else - if [ -e $src ];then - $CRYPTCMD $PARAMS -d $key create $dst $src - else - echo -en "\t\t$src not found" - fi - fi - - if test "x$MAKESWAP" = "xyes" && test -b $MAPPER/$dst; then - mkswap $MAPPER/$dst 2>/dev/null >/dev/null - fi - - if test "x$MAKETMP" = "xyes" && test -b $MAPPER/$dst; then - mke2fs $MAPPER/$dst 2>/dev/null >/dev/null - fi - fi - done - echo "." - ### MODED: mount stuff by age - partitions=`dmsetup ls | cut -f1` - for i in $partitions; do - if [ `mount | grep -c "^/dev/mapper/$i$"` -lt 1 ]; then - echo -en "\t$i (mounting)" - mount /dev/mapper/$i > /dev/null 2>&1 - if [ $(mount | grep -c "^/dev/mapper/$i$") -lt 1 ]; then - echo -en " (\"mount /dev/mapper/$i\" failed)" - fi - echo "" - fi - done - ### - ;; -stop) - echo -n "Stopping crypto disks:" - egrep -v "^[[:space:]]*(#|$)" $TABFILE | while read dst src key; do - echo -ne "\n\t $dst" - if test -b $MAPPER/$dst; then - if $DEVMAPCMD info $dst | grep -q '^Open count: *0$'; then - dev=`$DEVMAPCMD table $dst | sed 's/^.* \([0-9]*:[0-9]*\) .*/\1/'` - major=`echo $dev | sed 's/:.*//'` - minor=`echo $dev | sed 's/.*://'` - - $CRYPTCMD remove $dst - if test -b $MAPPER/$dst; then - echo -n " (busy) (still decrypted)" - else - echo -n " (stopped)" - fi - # Detach loopback device, if attached - if test -f $src -a $major -eq 7; then - losetup -d /dev/loop$minor - fi - else - echo -n " (busy) (still decrypted)" - fi - else - echo -n " (stopped)" - fi - done - - echo "." - ;; -restart|reload|force-reload) - $0 stop - $0 start - ;; -retry) - $0 start - ;; -*) - echo "Usage: $0 {start|stop|restart|reload|force-reload|retry}" - ;; -esac - diff --git a/test/dmcrypt-wrapper.sh b/test/dmcrypt-wrapper.sh deleted file mode 100755 index c388733..0000000 --- a/test/dmcrypt-wrapper.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh -# -# a simple wrapper around cryptdisks to: -# mount after cryptsetup -# umount before cryptsetup - -# break on error or undefined variables -set -eu - - -crypt_mount() -{ - local partitions=`dmsetup ls | grep -v "No devices found" | cut -f1` - for i in $partitions; do - if mount | grep -q "^/dev/mapper/$i$"; then - #if [ `mount | grep -c /dev/mapper/$i` -lt 1 ]; then - echo -en "\t$i(mounting)" - mount "/dev/mapper/$i" &>/dev/null || echo -en "(failed)" >&2 - else echo -en "\t$i(already mounted)" - fi - echo "" - done -} - - -crypt_umount() -{ - local partitions=`dmsetup ls | grep -v "No devices found" | cut -f1` - for i in $partitions; do - if mount | grep -q "^/dev/mapper/$i$"; then - #if [ `mount | grep -c /dev/mapper/$i` -gt 0 ]; then - echo -en "\t$i (unmounting)" - umount "/dev/mapper/$i" &>/dev/null || echo -en "(failed!)" >&2 - else echo -en "\t$i(not mounted)" - fi - echo "" - done -} - -show_active_mappings() -{ - mappings=`dmsetup ls | cut -f1` - if [ "X$mappings" != "X" ]; then - echo "there are still some active mappings:" - echo "$mappings" - fi -} - - -########### do it! ############## - -ACTION=help -[ $# -gt 0 ] && ACTION="$1" - -case "$ACTION" in - start|retry ) - /etc/init.d/cryptdisks start - crypt_mount - ;; - stop ) - crypt_umount - /etc/init.d/cryptdisks stop - show_active_mappings - ;; - restart|reload|force-reload ) - $0 stop - $0 start - ;; - * ) - echo "Syntax: `basename $0` { start | stop | restart | retry | reload | force-reload | help }" - ;; - esac - diff --git a/test/exec_crypt_or_timeout.sh b/test/exec_crypt_or_timeout.sh deleted file mode 100755 index 39840ad..0000000 --- a/test/exec_crypt_or_timeout.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# \ -exec expect -f "$0" ${1+"$@"} -# take commandline value as timeout -#set timeout $argv -set timeout 7 -set prog "/etc/init.d/dmcrypt-wrapper.sh" - -if {[file executable $prog]} { - set progstart "$prog start" -} else { - send "\"$prog\" not found or is not executable\n" - exit -} -send_user "Press return to activate cryptodevices! " -expect -re \n { - system $progstart - exit - } -send "\n\ttimeout after $timeout seconds - not starting \"$prog\"\n" -exit - #send_user $expect_out(buffer);