[Pkg-cryptsetup-devel] Bug#488131: cryptsetup: Please support keyfile on partition using extended attributes

[James Westby]

Package: cryptsetup
Version: 2:1.0.6-2
Severity: wishlist
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu intrepid ubuntu-patch

Hi,

In

  https://bugs.edge.launchpad.net/ubuntu/+source/cryptsetup/+bug/231339

a user reported problems when their key file is on a filesystem using
extended attributes. It would be great to support this.

The following patch "bugmenot" is used in Ubuntu to allow this. Please
consider applying it.

Thanks,

James


diff -pruN 2:1.0.6-2/debian/cryptdisks.functions
2:1.0.6-2ubuntu7/debian/cryptdisks.functions
--- 2:1.0.6-2/debian/cryptdisks.functions	2008-06-20 22:19:57.000000000 +0100
+++ 2:1.0.6-2ubuntu7/debian/cryptdisks.functions	2008-06-20 22:16:41.000000000 +0100

@@ -246,7 +248,8 @@ check_key () {
 	OMODE=$(ls -l "$key" | sed 's/[[:space:]].*//;s/^.\{7\}//')
 	GMODE=$(ls -l "$key" | sed 's/[[:space:]].*//;s/^.\{4\}\(.\{3\}\).*/\1/')
 	GROUP=$(ls -l "$key" | sed 's/^.\{11\}[^[:space:]]* [^[:space:]]* \([^[:space:]]*\).*/\1/')
-	OWNER=$( ls -l "$key" | sed 's/^.\{11\}[^[:space:]]* \([^[:space:]]*\).*/\1/')
+	# bugfix: make regex work if keyfile has extended attributes, https://launchpad.net/bugs/231339
+	OWNER=$( ls -l "$key" | sed 's/^.\{10\}[+]\?.[^[:space:]]* \([^[:space:]]*\).*/\1/')
 
 	# LUKS requires a persistent key, /dev/*random is not supported
 	if [ "$USELUKS" = "yes" ] && [ "$key" != "${key%random}" ]; then