lp:~darkcharl/ubuntu/trusty/cryptsetup/bug-1301086

Created by dc and last modified
Get this branch:
bzr branch lp:~darkcharl/ubuntu/trusty/cryptsetup/bug-1301086
Only dc can upload to this branch. If you are dc please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
dc
Status:
Development

Recent revisions

96. By dc

Fixes bug (LP: #1301086) where askpass fails to restore terminal
settings.

95. By Dimitri John Ledkov

* Merge from debian unstable, remaining changes:
  - debian/control:
    + Bump initramfs-tools Suggests to Depends: so system is not
      potentially rendered unbootable.
    + Depend on plymouth.

  - Invert the "busybox | busybox-static" Recommends, as the latter is
    the one we ship in main as part of the ubuntu-standard task.

  - Remove hardcoded paths to udevadm (LP: #1184066).

  - debian/initramfs/cryptroot-hook:
    + Do not unconditionally include cryptsetup utils in the initramfs.
    + Do not include any modules or utils in the initramfs, unless
      rootfs/resume devices are encrypted or CRYPTSETUP is set to 'y' in
      the initramfs.conf configuration file.

  - debian/cryptsetup.maintscripts:
    + Migrate upstart jobs to new names.

94. By Dimitri John Ledkov

* debian/initramfs/cryptroot-hook:
  - Do not unconditionally include cryptsetup utils in the initramfs.
  - Do not include any modules or utils in the initramfs, unless
    rootfs/resume devices are encrypted or CRYPTSETUP is set to 'y' in
    the initramfs.conf configuration file.

93. By Colin Watson

Remove hardcoded paths to udevadm (LP: #1184066).

92. By Adam Conrad

Invert the "busybox | busybox-static" Recommends, as the latter
is the one we ship in main as part of the ubuntu-standard task.

91. By Dimitri John Ledkov

* Merge from debian unstable, remaining changes:
  - debian/control:
    + Bump initramfs-tools Suggests to Depends: so system is not
      potentially rendered unbootable.
    + Depend on plymouth.

  - init/upstart jobs:
    + Rename cryptddisks{,-early}.upstart jobs to
      cryptdisks-{enable,udev}.upstart, as we need both init & upstart jobs
      for now.
    + 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'.
    + Do not install start symlinks for init scripts
    + NB! shutdown is still handled by the SystemV init scripts

90. By Dimitri John Ledkov

* Merge from debian unstable (LP: #1015753), remaining changes:
  - debian/control:
    + Bump initramfs-tools Suggests to Depends: so system is not
      potentially rendered unbootable.
    + Depend on plymouth.

  - init/upstart jobs:
    + Add debian/cryptdisks-{enable,udev}.upstart for bootup.
    + 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'.
    + Do not install start symlinks for init scripts
    + NB! shutdown is still handled by the SystemV init scripts

* Rename cryptddisks{,-early}.upstart jobs back to
  cryptdisks-{enable,udev}.upstart, as we need both init & upstart jobs
  for now.

* Dropped Changes, included in Debian:
  - debian/control:
    + Split up package in cryptsetup and cryptsetup-bin. (LP: #343363).

  - debian/cryptdisks.functions:
    + Do not overwrite existing filesystems when creating swap (LP: #474258).
    + Add aesni module when we have hardware encryption.
    + Call 'udevadm settle' before 'dmsetup rename' http://pad.lv/874774
    + Suppress "Starting init crypto disks" message in "init" phase, to
      avoid writing over fsck progress text.
    + 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
    + handle the case where crypttab contains a name for the source
      device that is not the kernel's preferred name for it (as is the case
      for LVs).

  - debian/initramfs/cryptroot-hook:
    + Quiet warnings from find on arches that don't have all the
      kernel/{arch,crypto} bits we're testing for.

89. By Steve Langasek

Our swap creation can trigger udev change events, which means udev may be
holding the device open at the time we try to call 'dmsetup rename' and
cause the /subsequent/ events to be missed because of dmsetup creating
device nodes by hand. So call 'udevadm settle' before 'dmsetup rename',
to ensure blkid is out of the way first. This should ensure swap
partitions are found by mountall in a non-racy manner. LP: #874774.

88. By Steve Langasek

releasing version 2:1.4.1-2ubuntu3

87. By Steve Langasek

Start cryptdisks-enable upstart job on 'or container', to let us
simplify the udevtrigger job.

Branch metadata

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

Subscribers