|
Line
Link Here
|
| 0 |
-- 1.0.6-r2-dm-crypt-start.sh.orig |
0 |
++ 1.0.6-r2-dm-crypt-start.sh |
|
Lines 24-31
Link Here
|
| 24 |
cryptsetup isLuks ${source} 2>/dev/null |
24 |
cryptsetup isLuks ${source} 2>/dev/null |
| 25 |
foo="$?" |
25 |
foo="$?" |
| 26 |
if [ "${foo}" -eq 0 ]; then |
26 |
if [ "${foo}" -eq 0 ]; then |
| 27 |
ewarn "The swap you have defined is a LUKS partition. Aborting crypt-swap setup." |
27 |
ewarn "The swap you have defined is a LUKS partition. Aborting crypt-swap setup." |
| 28 |
return |
28 |
return |
| 29 |
fi |
29 |
fi |
| 30 |
target=${swap} |
30 |
target=${swap} |
| 31 |
# swap contents do not need to be preserved between boots, luks not required. |
31 |
# swap contents do not need to be preserved between boots, luks not required. |
|
Lines 35-51
Link Here
|
| 35 |
else |
35 |
else |
| 36 |
return |
36 |
return |
| 37 |
fi |
37 |
fi |
| 38 |
if [ -z "$source" ] && [ ! -e "$source" ]; then |
|
|
| 39 |
ewarn "source \"${source}\" for ${target} missing, skipping..." |
| 40 |
return |
| 41 |
fi |
| 42 |
|
38 |
|
| 43 |
if [[ -n ${loop_file} ]] ; then |
39 |
if [[ -n ${loop_file} ]] ; then |
| 44 |
dev="/dev/mapper/${target}" |
40 |
dev="/dev/mapper/${target}" |
| 45 |
ebegin " Setting up loop device ${source}" |
41 |
|
| 46 |
/sbin/losetup ${source} ${loop_file} |
42 |
if [ -z "$source" ] && [ ! -e "$source" ]; then |
|
|
43 |
ebegin " Setting up loop device for ${loop_file} " |
| 44 |
source=$(/sbin/losetup -f -v ${loop_file} | grep 'Loop device is ' | sed -e 's/Loop device is //') |
| 45 |
if [ -z "$source" ] && [ ! -e "$source" ]; then |
| 46 |
ewarn " failed to setup loop device" |
| 47 |
else |
| 48 |
einfo " used loop device ${source}" |
| 49 |
fi |
| 50 |
else |
| 51 |
ebegin " Setting up loop device ${source}" |
| 52 |
/sbin/losetup ${source} ${loop_file} |
| 53 |
fi |
| 47 |
fi |
54 |
fi |
| 48 |
|
55 |
|
|
|
56 |
if [ -z "$source" ] && [ ! -e "$source" ]; then |
| 57 |
ewarn "source \"${source}\" for ${target} missing, skipping..." |
| 58 |
cryptfs_status=1 |
| 59 |
return |
| 60 |
fi |
| 61 |
|
| 49 |
# cryptsetup: |
62 |
# cryptsetup: |
| 50 |
# luksOpen <device> <name> # <device> is $source |
63 |
# luksOpen <device> <name> # <device> is $source |
| 51 |
# create <name> <device> # <name> is $target |
64 |
# create <name> <device> # <name> is $target |
| 52 |
-- 1.0.5-dm-crypt-stop.sh.orig |
65 |
++ 1.0.5-dm-crypt-stop.sh |
|
Lines 22-34
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 "^(loop_file=)" /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 "^(loop_file)" /etc/conf.d/dmcrypt | while read loopfileline |
| 28 |
do |
28 |
do |
| 29 |
source= |
29 |
loop_file= |
| 30 |
eval ${sourceline} |
30 |
eval ${loopfileline} |
| 31 |
if [[ -n $(echo ${source} | grep /dev/loop) ]] ; then |
31 |
source=$(/sbin/losetup -j ${loop_file} | sed -e "s/:.*//" | grep /dev/loop) |
|
|
32 |
if [ -n "${source}" ] ; then |
| 32 |
ebegin " Taking down ${source}" |
33 |
ebegin " Taking down ${source}" |
| 33 |
/sbin/losetup -d ${source} |
34 |
/sbin/losetup -d ${source} |
| 34 |
eend $? " Failed to remove loop" |
35 |
eend $? " Failed to remove loop" |
| 35 |
-- 1.0.6-dmcrypt.confd.orig |
36 |
++ 1.0.6-dmcrypt.confd |
|
Lines 90-94
Link Here
|
| 90 |
|
90 |
|
| 91 |
## Loopback file example |
91 |
## Loopback file example |
| 92 |
#mount='crypt-loop-home' |
92 |
#mount='crypt-loop-home' |
| 93 |
#source='/dev/loop0' |
93 |
#source='/dev/loop0' # if omitted, losetup -f is used |
| 94 |
#loop_file='/mnt/crypt/home' |
94 |
#loop_file='/mnt/crypt/home' |
