Created by James Westby on 2010-02-20 and last modified on 2010-02-20
Get this branch:
bzr branch lp:ubuntu/karmic-updates/cryptsetup
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Ubuntu branches
Review team:
Ubuntu Development Team

Recent revisions

65. By Steve Langasek on 2009-12-22

* Depend on watershed.
* cryptdisks.functions: 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.
  LP: #475936.

64. By Steve Langasek on 2009-11-04

* debian/cryptdisks.functions:
  - 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
  - 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
* debian/cryptdisks-udev.upstart: new, additional upstart job run once for
  each block device, using the new crypttab_start_one_disk function,
  triggered by udev; this doesn't eliminate the possibility of a race with
  gdm when the decrypted volume isn't a 'bootwait' mount point (since gdm
  kills usplash), but it does eliminate the race between udev and
  cryptsetup. LP: #454898.
  The other cryptdisks-enable job is still needed as well, to give us the
  second pass needed to cover devices that are decrypted using keys stored
  on other encrypted disks. LP: #443980.
* debian/cryptdisk.functions: 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.
  LP: #475936.
* Make the 'start' action of the init script a no-op, this should be
  handled entirely by the upstart job now; ad remove any symlinks from
  /etc/rcS.d on upgrade. LP: #473615.

63. By Scott James Remnant (Canonical) on 2009-10-14

Reupload previous version, siretart had left changes in bzr which
weren't documented in the changelog and caused FTBFS.

62. By Scott James Remnant (Canonical) on 2009-10-14

[ Steve Langasek ]
* Move the Debian Vcs- fields aside.

[ Scott James Remnant ]
* debian/cryptdisks-enable.upstart: Don't overcompensate for my idiocy,
  cryptsetup should not need a controlling terminal, just a terminal
  is fine. May fix LP: #439138.

61. By Scott James Remnant (Canonical) on 2009-09-17

debian/cryptdisks-enable.upstart: Things that often help include
not setting stdin/out to /dev/null, so you can actually type the
passphrase. I am an idiot. LP: #430496.

60. By Scott James Remnant (Canonical) on 2009-09-17

debian/cryptdisks-enable.upstart: add upstart job to enable encrypted
disks once we've finished probing for udev devices, so that mountall
can use them. LP: #430496.

59. By Steve Langasek on 2009-09-15

debian/initramfs/cryptroot-conf: declare that we want usplash included
in the initramfs whenever this package is installed. LP: #427356.

58. By Kees Cook on 2009-05-10

* Merge from debian unstable, remaining changes:
  - Ubuntu specific:
    + debian/rules: link dynamically for better security supportability and
      smaller packages.
    + debian/control: Depend on initramfs-tools so system is not potentially
      rendered unbootable.
  - debian/initramfs/cryptroot-script wait for encrypted device to appear,
    report with log_*_msg (debian bug 488271).
  - debian/initramfs/cryptroot-hook: fix support for UUID and LABEL
    correlation between fstab and crypttab (debian bug 522041).
  - debian/askpass.c, debian/initramfs/cryptroot-script: using newline
    escape in passphrase prompt to avoid line-wrapping (debian bug 528133).
* Drop 04_fix_udevsettle_call.patch: fixed upstream differently.

57. By Kees Cook on 2009-04-09

debian/control: Depend on initramfs-tools so system is not potentially
rendered unbootable (LP: #358654).

56. By Steve Langasek on 2009-03-07

debian/initramfs/cryptroot-script: we don't require vol_id to understand
the encrypted device, but we should check the device is fully up first
before continuing by calling udevadm settle. LP: #291752.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.