-
Committer:
Bazaar Package Importer
-
Author(s):
Lorenzo De Liso
-
Date:
2010-11-27 17:37:43 UTC
-
mfrom:
(0.1.16 sid)
-
Revision ID:
james.westby@ubuntu.com-20101127173743-j2bogiz72hsd3blz
Tags: 2:1.1.3-4ubuntu1
* 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.