David, Max, This commit brings partman-crypto in line with user-setup when it comes to asking for the passphrase and confirming it. Could you please check and test? Thanks, FJP On Sunday 22 October 2006 22:44, Frans Pop wrote: > Author: fjp > Date: Sun Oct 22 20:44:44 2006 > New Revision: 42007 > > Modified: > trunk/packages/partman/partman-crypto/blockdev-keygen > trunk/packages/partman/partman-crypto/debian/changelog > > trunk/packages/partman/partman-crypto/debian/partman-crypto.templates > > Log: > - Ask for passphrase and passphrase confirmation in one db_go > - Change template type for empty passphrase to error > > > > Modified: trunk/packages/partman/partman-crypto/blockdev-keygen > ============================================================================== > --- trunk/packages/partman/partman-crypto/blockdev-keygen (original) > +++ trunk/packages/partman/partman-crypto/blockdev-keygen Sun Oct 22 20:44:44 2006 > @@ -37,28 +37,28 @@ > db_fset $templ seen false > db_subst $templ DEVICE "$description" > db_input critical $templ > + > + templ="partman-crypto/passphrase-again" > + db_set $templ "" > + db_fset $templ seen false > + db_input critical $templ > + > db_go || return 1 > - db_get $templ || RET='' > + > + db_get partman-crypto/passphrase || RET='' > pass=$RET > if [ -z "$pass" ]; then > templ="partman-crypto/passphrase-empty" > db_fset $templ seen false > db_input critical $templ > - db_go || true > continue > fi > - > - templ="partman-crypto/passphrase-again" > - db_set $templ "" > - db_fset $templ seen false > - db_input critical $templ > - db_go || return 1 > - db_get $templ || RET='' > + > + db_get partman-crypto/passphrase-again || RET='' > if [ "$pass" != "$RET" ]; then > templ="partman-crypto/passphrase-mismatch" > db_fset $templ seen false > db_input critical $templ > - db_go || true > continue > fi > > > Modified: trunk/packages/partman/partman-crypto/debian/changelog > ============================================================================== > --- trunk/packages/partman/partman-crypto/debian/changelog (original) > +++ trunk/packages/partman/partman-crypto/debian/changelog Sun Oct 22 20:44:44 2006 > @@ -2,9 +2,11 @@ > > [ Frans Pop ] > * crypto_tools.sh: quote variable to avoid syntax error. > + * Ask for passphrase and passphrase confirmation in one db_go. > + * Change template type for empty passphrase to error. > > [ Max Vozeler ] > - * blockdev-keygen: Kill writer pipes on failure and move the > + * blockdev-keygen: Kill writer pipes on failure and move the > check for the entropy plugin to the start. > * Show short name of the crypto device in the mountpoint column > of the corresponding partition. Closes: #381968, #393919 > @@ -16,7 +18,7 @@ > a patch from James Westby <jw+debian@jameswestby.net>. Closes: > 392080 > > - -- Max Vozeler <xam@debian.org> Sun, 22 Oct 2006 17:55:42 +0200 > + -- Frans Pop <fjp@debian.org> Sun, 22 Oct 2006 22:43:28 +0200 > > partman-crypto (15) unstable; urgency=low > > > Modified: > trunk/packages/partman/partman-crypto/debian/partman-crypto.templates > ============================================================================== >--- trunk/packages/partman/partman-crypto/debian/partman-crypto.templates (original) >+++ trunk/packages/partman/partman-crypto/debian/partman-crypto.templates Sun Oct 22 20:44:44 2006 @@ -292,7 +292,7 @@ > The two passphrases you entered were not the same. Please try again. > > Template: partman-crypto/passphrase-empty > -Type: note > +Type: error > _Description: Empty passphrase > You entered an empty passphrase, which is not allowed. > Please choose a non-empty passphrase.
Attachment:
pgpv1qF66R9ew.pgp
Description: PGP signature