lp:ubuntu/maverick/cryptsetup
- Get this branch:
- bzr branch lp:ubuntu/maverick/cryptsetup
Branch merges
Branch information
Recent revisions
- 80. By Steve Langasek
-
* 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
-
* 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
-
[ David Stansby ]
Fix grammar error in debian/initramfs/ cryptroot- script
("setup" -> "set up") (LP: #578896) - 77. By Colin Watson
-
debian/
initramfs/ cryptroot- script: Don't leak /conf/conf. d/cryptroot
file descriptor to subprocesses. - 76. By Steve Langasek
-
* 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
-
* 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
-
* 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
-
* 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). - 72. By Steve Langasek
-
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.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/natty/cryptsetup