Attachment 144366 Details for Bug 220768 – patch for /etc/rc.d/rc.sysinit

[patch] patch for /etc/rc.d/rc.sysinit

bugEncryptFS.txt (text/plain), 2.02 KB, created by Mike Breen on 2006-12-26 11:50:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Breen

Created: 2006-12-26 11:50:47 UTC

Size: 2.02 KB

patch

obsolete

>rc.sysinit: Allow more than one attempt at non-LUKS passphrase
>
>At boot-up, an incorrect passphrase may result in failing to
>mount an encrypted filesystem; this leaves the user needing to
>manually create the device and mount it (in the best case).
>
>For encryption with LUKS, cryptsetup does allow several attempts
>at the passphrase; with non-LUKS encryption, cryptsetup can't
>tell whether the passphrase is correct and so may just create an
>encrypted device which seems to contain random data.
>Propose the following change to rc.sysinit:
>
># rcsdiff -u /etc/rc.d/rc.sysinit
>===================================================================
>RCS file: /etc/rc.d/RCS/rc.sysinit,v
>retrieving revision 1.2
>diff -u -r1.2 /etc/rc.d/rc.sysinit
>--- /etc/rc.d/rc.sysinit        2006/12/25 07:25:19     1.2
>+++ /etc/rc.d/rc.sysinit        2006/12/26 08:02:53
>@@ -208,10 +208,31 @@
>                    "ignoring them"
>            fi
>            /sbin/cryptsetup ${key:+-d $key} luksOpen "$src" "$dst" <&1
>+           rc=$?
>        else
>-           /sbin/cryptsetup $params ${key:+-d $key} create "$dst" "$src" <&1
>+           while ((1)); do
>+               /sbin/cryptsetup $params ${key:+-d $key} create "$dst" "$src" <&1
>+               rc=$?
>+               if [ $rc -ne 0 ]; then
>+                   break;
>+               elif blkid "/dev/mapper/$dst" >/dev/null; then
>+                   break;
>+               fi
>+               echo "/dev/mapper/$dst is not a recognized block device -" \
>+                   "passphrase may be incorrect."
>+               echo -n "Try again (y/[n])? "
>+               read AGAIN <&1
>+               case "$AGAIN" in
>+                   Y|yes|Yes|YES)
>+                       AGAIN=y
>+                       ;;
>+               esac
>+               if [ "$AGAIN" != "y" ]; then
>+                   break
>+               fi
>+               /sbin/cryptsetup remove "$dst"
>+           done
>        fi
>-       rc=$?
>        if [ -z "$key" -a -x /usr/bin/rhgb-client ] \
>            && /usr/bin/rhgb-client --ping ; then
>            chvt 8

Actions: View | Diff

Attachments on bug 220768: 144366 | 144395