Attachment 302892 Details for Bug 443082 – 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.54 KB, created by Stefan Becker on 2008-04-18 15:17:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Becker

Created: 2008-04-18 15:17:18 UTC

Size: 2.54 KB

patch

obsolete

>diff -up /sbin/mkinitrd-6.0.45 /sbin/mkinitrd
>--- /sbin/mkinitrd-6.0.45	2008-04-12 05:22:08.000000000 +0300
>+++ /sbin/mkinitrd	2008-04-12 17:11:06.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
> 
>@@ -1214,12 +1214,29 @@ if [ "x$PROBE" == "xyes" ]; then
>         suspdev=$(findblockdevinsys "$swsuspdev")
>         suspdev=${suspdev##*/dev/}
>         if [ -n "$suspdev" ]; then
>-	    vecho "Found swsusp device $suspdev for $swsuspdev"
>+            vecho "Found swsusp device $suspdev for $swsuspdev"
>         fi
>         if [ -n "$suspdev" -a "$suspdev" != "$swsuspdev" ]; then
>             handlelvordev "$suspdev"
>         fi
>-	handlelvordev "$swsuspdev"
>+        handlelvordev "$swsuspdev"
>+        unset suspdev
>+
>+        # detect encrypted swap
>+        basesusp=$(basename $swsuspdev)
>+        detect_cryptoswap() {
>+            local type=$1
>+            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
>+        unset basesusp
>     fi
> fi
> 
>@@ -1782,12 +1799,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 +1825,7 @@ if [ -n "$raiddevices" ]; then
>     done
> fi
> 
>+emitcryptoswap raid
> for cryptdev in ${!cryptoraid@} ; do
>     emitcrypto `eval echo '$'$cryptdev`
> done
>@@ -1809,6 +1837,7 @@ 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

Actions: View | Diff

Attachments on bug 443082: 302892