Attachment 301770 Details for Bug 441001 – unlock & resume from encrypted swap before anything else

[patch] unlock & resume from encrypted swap before anything else

mkinitrd-detect-encrypted-swap.patch (text/plain), 2.45 KB, created by Stefan Becker on 2008-04-09 10:09:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Becker

Created: 2008-04-09 10:09:32 UTC

Size: 2.45 KB

patch

obsolete

>diff -up /sbin/mkinitrd.orig /sbin/mkinitrd
>--- /sbin/mkinitrd.orig	2008-04-07 20:01:18.000000000 +0300
>+++ /sbin/mkinitrd	2008-04-09 13:04:40.000000000 +0300
>@@ -715,7 +715,7 @@ handledm() {
>                     eval cryptoraid${ncryptoraids}='"'/dev/$slavedev $dmname'"'
>                     let ncryptoraids++
>                 else
>-                    eval cryptoparts${ncryptoparts}='"'/dev/$slavedev $dmname'"'
>+                    eval cryptopart${ncryptoparts}='"'/dev/$slavedev $dmname'"'
>                     let ncryptoparts++
>                 fi
> 
>@@ -1220,6 +1220,26 @@ if [ "x$PROBE" == "xyes" ]; then
>         if [ -n "$swsuspdev" ]; then
>             handlelvordev "$swsuspdev"
>         fi
>+
>+        # detect encrypted swap
>+        basesusp=$(basename $swsuspdev)
>+        if [[ "$swsuspdev" != "$basesusp" ]]; then
>+            detect_cryptoswap() {
>+                type=$1; shift;
>+                for cryptdev in $(eval echo \${!crypto${type}@} ); do
>+	            if [[ "$basesusp" == "$(echo ${!cryptdev} | cut -d' ' -f2)" ]]; then
>+                        eval cryptoswap$type=\"${!cryptdev}\"
>+		        unset $cryptdev
>+                     fi
>+                done
>+            }
>+            detect_cryptoswap part
>+            detect_cryptoswap raid
>+            detect_cryptoswap lv
>+        fi
>+        unset basesusp
>+       
>+        swsuspdev="/dev/$swsuspdev" 
>     fi
> fi
> 
>@@ -1782,12 +1802,22 @@ emitcrypto()
>     emit "echo Setting up disk encryption: $1"
>     emit "cryptsetup luksOpen $1 $2"
> }
>+emitcryptoswap()
>+{
>+    local swap="cryptoswap$1"
>+    if [ -z "$noresume" -a -n "$swsuspdev" -a -n "${!swap}" ]; then
>+        emitcrypto ${!swap}
>+        emit "resume $swsuspdev"
>+        noresume=1
>+    fi
>+}
> 
> if [ -n "$KEYMAP" ]; then
>     emit "echo Loading keymap."
>     emit "$LOADKEYS $KEYMAP"
> fi
> 
>+emitcryptoswap part
> for cryptdev in ${!cryptopart@} ; do
>     emitcrypto `eval echo '$'$cryptdev`
> done
>@@ -1798,6 +1828,7 @@ if [ -n "$raiddevices" ]; then
>     done
> fi
> 
>+emitcryptoswap raid
> for cryptdev in ${!cryptoraid@} ; do
>     emitcrypto `eval echo '$'$cryptdev`
> done
>@@ -1809,12 +1840,13 @@ if [ -z "$nolvm" -a -n "$vg_list" ]; the
>     emit "lvm vgchange -ay --ignorelockingfailure $vg_list"
> fi
> 
>+emitcryptoswap lv
> for cryptdev in ${!cryptolv@} ; do
>     emitcrypto `eval echo '$'$cryptdev`
> done
> 
> if [ -z "$noresume" -a -n "$swsuspdev" ]; then
>-    emit "resume /dev/$swsuspdev"
>+    emit "resume $swsuspdev"
> fi
> 
> if [ -n "$loopfs" ]; then

Actions: View | Diff

Attachments on bug 441001: 301770 | 302226