Hello,
Several users asked me to fix some easy bugs in the squeeze cryptsetup
package. Therefore I now prepared cryptsetup 2:1.1.3-4squeeze1 which
fixes three annoying bugs with small patches.
the changelog is:
cryptsetup (2:1.1.3-4squeeze1) stable-proposed-updates; urgency=low
* NOT RELEASED YET
* install cryptkeyctl initramfs hook, needed for keyctl keyscript in
initramfs, thanks to Maik Zumstrull (closes: #610750)
* fix luksformat script to invoke usage() with --help. (closes: #612947)
* luksformat: invoke udevadm settle between mkfs.vfat and luksClose, to
prevent possible race conditions. This is a workaround. (closes: #601886)
-- Jonas Meurer <mejo@debian.org> Wed, 09 Mar 2011 21:21:11 +0100
the debdiff is attached.
greetings,
jonas
diff '--exclude=.svn' -rNu tags/2:1.1.3-4/debian/changelog branches/squeeze/debian/changelog
--- tags/2:1.1.3-4/debian/changelog 2011-03-09 21:50:06.000000000 +0100
+++ branches/squeeze/debian/changelog 2011-03-09 21:49:39.000000000 +0100
@@ -1,3 +1,13 @@
+cryptsetup (2:1.1.3-4squeeze1) stable-proposed-updates; urgency=low
+
+ * install cryptkeyctl initramfs hook, needed for keyctl keyscript in
+ initramfs, thanks to Maik Zumstrull (closes: #610750)
+ * fix luksformat script to invoke usage() with --help. (closes: #612947)
+ * luksformat: invoke udevadm settle between mkfs.vfat and luksClose, to
+ prevent possible race conditions. This is a workaround. (closes: #601886)
+
+ -- Jonas Meurer <mejo@debian.org> Wed, 09 Mar 2011 21:49:36 +0100
+
cryptsetup (2:1.1.3-4) unstable; urgency=high
* bump standards-version to 3.9.1, no changes required
diff '--exclude=.svn' -rNu tags/2:1.1.3-4/debian/rules branches/squeeze/debian/rules
--- tags/2:1.1.3-4/debian/rules 2010-11-04 20:40:21.000000000 +0100
+++ branches/squeeze/debian/rules 2011-03-09 21:24:08.000000000 +0100
@@ -123,6 +123,8 @@
install -m 0755 debian/askpass $(CURDIR)/debian/cryptsetup/lib/cryptsetup/
install -m 0755 debian/initramfs/cryptgnupg-hook \
$(CURDIR)/debian/cryptsetup/usr/share/initramfs-tools/hooks/cryptgnupg
+ install -m 0755 debian/initramfs/cryptkeyctl-hook \
+ $(CURDIR)/debian/cryptsetup/usr/share/initramfs-tools/hooks/cryptkeyctl
install -m 0755 debian/initramfs/cryptpassdev-hook \
$(CURDIR)/debian/cryptsetup/usr/share/initramfs-tools/hooks/cryptpassdev
install -m 0755 debian/initramfs/cryptopensc-hook \
diff '--exclude=.svn' -rNu tags/2:1.1.3-4/debian/scripts/luksformat branches/squeeze/debian/scripts/luksformat
--- tags/2:1.1.3-4/debian/scripts/luksformat 2010-11-04 20:40:21.000000000 +0100
+++ branches/squeeze/debian/scripts/luksformat 2011-03-09 21:21:05.000000000 +0100
@@ -10,7 +10,7 @@
use Getopt::Long qw(:config pass_through);
-sub help() {
+sub usage() {
print "luksformat - Create and format an encrypted LUKS device
Usage: luksformat [-t <file system>] <device> [ mkfs options ]\n";
exit 1;
@@ -20,7 +20,10 @@
$fs = 'vfat';
exit 1 unless GetOptions ('t|type=s' => \$fs);
-help() if $#ARGV < 0;
+GetOptions ('help', \$help);
+if (($#ARGV < 0) || ($help)) {
+ usage();
+}
if ($> != 0) {
print STDERR "This program needs to be started as root\n";
@@ -71,6 +74,7 @@
$result = system $mkfs, "/dev/mapper/$name", @ARGV;
print "\n";
+system 'udevadm', 'settle', '--timeout=30';
system 'cryptsetup', 'luksClose', $name;
die "Could not format device with file system $fs" if $result;
Attachment:
signature.asc
Description: Digital signature