From da5432523c4720dba52112a9ee4247e9b49032d9 Mon Sep 17 00:00:00 2001
From: TJ <ubuntu@tjworld.net>
Date: Mon, 5 Dec 2011 17:33:38 +0000
Subject: [PATCH] LP874774: Use DEVLINKS to match crypttab entries

---
 debian/cryptdisks.functions |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/debian/cryptdisks.functions b/debian/cryptdisks.functions
index 494697f..a69e8d2 100644
--- a/debian/cryptdisks.functions
+++ b/debian/cryptdisks.functions
@@ -641,6 +641,13 @@ crypttab_start_one_disk () {
 			src="/dev/disk/by-uuid/${src#UUID=}"
 		elif [ "xLABEL=$ID_FS_LABEL_ENC" = "x$src" ]; then
 			src="/dev/disk/by-label/${src#LABEL=}"
+		elif [ -n "$DEVLINKS" ]; then
+			for link in $DEVLINKS; do
+				if [ "x$link" != "x$src" ]; then
+					continue
+				fi
+				break 2
+			done
 		elif [ "x$1" != "x$src" ]; then
 			continue
 		fi
-- 
1.7.5.4