Control: tag -1 + patch Hi,
Am Freitag, den 01.11.2013, 17:52 +0100 schrieb Jonas Meurer: > A patch would be perfect. I'm rather busy at the moment, thus it's > hard to me to keep up with cryptsetup maintenance work. I think that > you last option should be prefered: print $cryptsource only if it's > not a UUID. patch attached; verified by running qemu on my real harddrive while runnig (and then not unlocking the disk :-))) Greetigs, Joachim -- Joachim "nomeata" Breitner Debian Developer [email protected] | ICQ# 74513189 | GPG-Keyid: 4743206C JID: [email protected] | http://people.debian.org/~nomeata
Index: cryptroot-script
===================================================================
--- cryptroot-script (Revision 976)
+++ cryptroot-script (Arbeitskopie)
@@ -248,12 +248,20 @@
fi
if [ -z "$cryptkeyscript" ]; then
- cryptkey="Unlocking the disk $cryptsource ($crypttarget)\nEnter passphrase: "
+ if [ ${cryptsource#/dev/disk/by-uuid/} != $cryptsource ]
+ then
+ # UUIDs are not very helpful
+ diskname="$crypttarget"
+ else
+ diskname="$cryptsource ($crypttarget)"
+ fi
if [ -x /bin/plymouth ] && plymouth --ping; then
cryptkeyscript="plymouth ask-for-password --prompt"
- cryptkey=$(printf "$cryptkey")
+ # Plymouth will add a : if it is a non-graphical prompt
+ cryptkey="Please unlock disk $diskname"
else
cryptkeyscript="/lib/cryptsetup/askpass"
+ cryptkey="Please unlock disk $diskname: "
fi
fi
signature.asc
Description: This is a digitally signed message part
