Merge lp:~csurbhi/ubuntu/natty/cryptsetup/cryptsetup.bug-fix566818 into lp:ubuntu/natty/cryptsetup

Proposed by Surbhi Palande
Status: Merged
Merge reported by: Colin Watson
Merged at revision: not available
Proposed branch: lp:~csurbhi/ubuntu/natty/cryptsetup/cryptsetup.bug-fix566818
Merge into: lp:ubuntu/natty/cryptsetup
Diff against target: 38 lines (+15/-1)
2 files modified
debian/changelog (+12/-0)
debian/initramfs/cryptroot-script (+3/-1)
To merge this branch: bzr merge lp:~csurbhi/ubuntu/natty/cryptsetup/cryptsetup.bug-fix566818
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+57882@code.launchpad.net

Description of the change

At boot the user passsword for a crypted device is captured by plymouth when it is available. By default the "details" plugin is used in text based logins. On every key stroke, the "details" plugin in plymouth clears only the current line before overwriting it with the password prompt. If the prompt is multilined then the last line ends up being overwritten but the previous lines are repeated. Changing the password prompt string to be single lined when plymouth is available. (LP:#566818)

Tested on kvm.

Please consider this change for natty.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Thanks! I've merged this into lp:~ubuntu-core-dev/cryptsetup/ubuntu instead, as that's where this package is currently maintained (see the Vcs-Bzr field).

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-11-27 17:37:43 +0000
3+++ debian/changelog 2011-04-15 14:21:49 +0000
4@@ -1,3 +1,15 @@
5+cryptsetup (2:1.1.3-4ubuntu2) natty; urgency=low
6+
7+ * debian/initramfs/cryptroot-script: At boot the user passsword for a
8+ crypted device is captured by plymouth when it is available. On every
9+ key stroke, the "details" plugin in plymouth clears only the current line
10+ before overwriting it with the password prompt. If the prompt is
11+ multilined then the last line ends up being overwritten but the previous
12+ lines are repeated. Changing the password prompt string to be single lined
13+ when plymouth is available. (LP:#566818)
14+
15+ -- Surbhi Palande <surbhi.palande@canonical.com> Fri, 15 Apr 2011 16:57:37 +0300
16+
17 cryptsetup (2:1.1.3-4ubuntu1) natty; urgency=low
18
19 * Merge from debian unstable (LP: #682177), remaining changes:
20
21=== modified file 'debian/initramfs/cryptroot-script'
22--- debian/initramfs/cryptroot-script 2010-11-27 17:37:43 +0000
23+++ debian/initramfs/cryptroot-script 2011-04-15 14:21:49 +0000
24@@ -271,11 +271,13 @@
25 fi
26
27 if [ -z "$cryptkeyscript" ]; then
28- cryptkey="Unlocking the disk $cryptsource ($crypttarget)\nEnter passphrase: "
29 if [ -x /bin/plymouth ] && plymouth --ping; then
30+ echo "Unlocking the disk $cryptsource ($crypttarget)"
31+ cryptkey="Enter passphrase: "
32 cryptkeyscript="plymouth ask-for-password --prompt"
33 cryptkey=$(echo -e "$cryptkey")
34 else
35+ cryptkey="Unlocking the disk $cryptsource ($crypttarget)\nEnter passphrase: "
36 cryptkeyscript="/lib/cryptsetup/askpass"
37 fi
38 fi

Subscribers

People subscribed via source and target branches