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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/natty/cryptsetup

Colin Watson: Approve on 2011-04-15

Diff: 38 lines (+15/-1)

2 files modified

debian/changelog (+12/-0)
debian/initramfs/cryptroot-script (+3/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

82. By Surbhi Palande on 2011-04-15

debian/initramfs/cryptroot-script: At boot the user passsword for a
crypted device is captured by plymouth when it is available. 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)

81. By Lorenzo De Liso on 2010-11-27

* Merge from debian unstable (LP: #682177), remaining changes:
  - debian/control:
    + Bump initramfs-tools Suggests to Depends: so system is not
      potentially rendered unbootable.
    + Depend on plymouth.
  - Add debian/cryptdisks-{enable,udev}.upstart.
  - debian/cryptdisks.functions:
    + new function, crypttab_start_one_disk, to look for the named source
      device in /etc/crypttab (by device name, UUID, or label) and start it
      if configured to do so
    + wrap the call to /lib/cryptsetup/askpass with watershed, to make sure
      we only ever have one of these running at a time; otherwise multiple
      invocations could steal each other's input and/or write over each
      other's output
    + when called by cryptdisks-enable, check that we don't already have a
      corresponding cryptdisks-udev job running (probably waiting for a
      passphrase); if there is, wait until it's finished before continuing.
  - debian/cryptdisks{,-early}.init: Make the 'start' action of the init
    script a no-op, this should be handled entirely by the upstart job;
    and fix the LSB header to not declare this should be started in
    runlevel 'S'
  - debian/cryptsetup.postinst: Remove any symlinks from /etc/rcS.d on
    upgrade.
  - debian/rules:
    + Do not install start symlinks for init scripts, and
      install debian/cryptdisks-{enable,udev}.upstart scripts.
    + link dynamically against libgcrypt and libgpg-error.
  - Add debian/cryptsetup.apport: Apport package hook. Install in
    debian/rules and create dir in debian/cryptsetup.dirs.
  - debian/cryptsetup.postrm: call update-initramfs on package removal.

80. By Steve Langasek on 2010-06-14

* Merge from Debian unstable (LP: #594365). Remaining changes:
  - debian/control:
    + Bump initramfs-tools Suggests to Depends: so system is not
      potentially rendered unbootable.
    + Depend on plymouth.
  - Add debian/cryptdisks-{enable,udev}.upstart.
  - debian/cryptdisks.functions:
    + new function, crypttab_start_one_disk, to look for the named source
      device in /etc/crypttab (by device name, UUID, or label) and start it
      if configured to do so
    + wrap the call to /lib/cryptsetup/askpass with watershed, to make sure
      we only ever have one of these running at a time; otherwise multiple
      invocations could steal each other's input and/or write over each
      other's output
    + initially create the device under a temporary name and rename it only
      at the end using 'dmsetup rename', to ensure that upstart/mountall
      doesn't see our device before it's ready to go.
    + do_tmp should mount under /var/run/cryptsetup for changing the
      permissions of the filesystem root, not directly on /tmp, since
      mounting on /tmp a) is racy, b) confuses mountall something fierce.
    + when called by cryptdisks-enable, check that we don't already have a
      corresponding cryptdisks-udev job running (probably waiting for a
      passphrase); if there is, wait until it's finished before continuing.
  - debian/cryptdisks{,-early}.init: Make the 'start' action of the init
    script a no-op, this should be handled entirely by the upstart job;
    and fix the LSB header to not declare this should be started in
    runlevel 'S'
  - debian/cryptsetup.postinst: Remove any symlinks from /etc/rcS.d on
    upgrade.
  - debian/rules: Do not install start symlinks for init scripts, and
    install debian/cryptdisks-{enable,udev}.upstart scripts.
  - Add debian/cryptsetup.apport: Apport package hook. Install in
    debian/rules and create dir in debian/cryptsetup.dirs.
  - debian/rules: link dynamically against libgcrypt and libgpg-error.
  - debian/cryptsetup.postrm: call update-initramfs on package removal.
* Dropped changes, merged/superseded in Debian:
  - Add ext4 support to passdev.
  - cryptroot-hook: don't call copy_modules_dir with empty arguments when
    archcrypto isn't found
  - Set USPLASH=y and FRAMEBUFFER=y in the hook config to pull plymouth into
    the initramfs.
  - change interaction to use plymouth directly if present, and if not, to
    fall back to /lib/cryptsetup/askpass as before
  - cryptdisks.functions: replace 'echo -e' bashism with 'printf'.
  - debian/initramfs/cryptroot-script: if plymouth is present in the
    initramfs, use this directly, bypassing the cryptsetup askpass script
  - debian/initramfs/cryptroot-hook: Properly anchor our regexps when
    grepping /etc/crypttab so that we don't incorrectly match device names
    that are substrings of one another.
  - debian/initramfs/cryptroot-script: Don't leak /conf/conf.d/cryptroot
    file descriptor to subprocesses.
  - Fix grammar error in debian/initramfs/cryptroot-script
    ("setup" -> "set up")
  - debian/initramfs/cryptroot-script: Fix this to work with current
    initramfs-tools:
    + Source /scripts/functions after checking for prerequisites.
    + prereqs(): Do not assume we are running within initramfs, and
      calculate relative path correctly.

79. By Bhavani Shankar on 2010-06-28

* debian/patches/03_add_missing_headers.patch:
  + Add missing headers to fix undefined reference to `S_ISDIR'linker
    error and hence fix FTBFS LP: #599311

78. By James Westby on 2010-05-17

[ David Stansby ]
Fix grammar error in debian/initramfs/cryptroot-script
("setup" -> "set up") (LP: #578896)

77. By Colin Watson on 2010-03-29

debian/initramfs/cryptroot-script: Don't leak /conf/conf.d/cryptroot
file descriptor to subprocesses.

76. By Steve Langasek on 2010-02-18

* debian/initramfs/cryptroot-hook: Properly anchor our regexps when
  grepping /etc/crypttab so that we don't incorrectly match device names
  that are substrings of one another.
* debian/cryptdisks-{enable,udev}.conf, debian/control: drop
  'console output' and add a hard dependency on plymouth instead of
  watershed, to avoid spitting extra messages to the console.

75. By Steve Langasek on 2010-01-25

* Set FRAMEBUFFER=y in the file that we actually ship.
* debian/cryptsetup.postrm: call update-initramfs on package removal.
  LP: #468228.

74. By Steve Langasek on 2010-01-21

* cryptdisks.functions: replace 'echo -e' bashism with 'printf'.
* cryptdisks.functions: when called by cryptdisks-enable, check that we
  don't already have a corresponding cryptdisks-udev job running (probably
  waiting for a passphrase); if there is, wait until it's finished before
  continuing.

73. By Steve Langasek on 2010-01-16

* Set FRAMEBUFFER=y in the hook config as well, to pull plymouth into the
  initramfs.
* cryptdisks.functions, debian/initramfs/cryptroot-script: fix the
  invocation of plymouth, so that we actually get proper passphrase prompts
  (once bug #496765 is fixed).