From: Andrew Gaffney <agaffney@gentoo.org>
Date: Fri, 23 Nov 2007 20:45:30 +0000 (+0000)
Subject: look for cryptsetup in /bin and /sbin
X-Git-Tag: v3.4.10.902~189
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cce65ad98cb38a2c6be47c710eda09804b6cb6f9;p=genkernel.git

look for cryptsetup in /bin and /sbin

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@563 67a159dc-881f-0410-a524-ba9dfbe2cb84
---

diff --git a/ChangeLog b/ChangeLog
index cce3e28..78e9a70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 Nov 2007; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh,
+  gen_initrd.sh:
+  look for cryptsetup in /bin and /sbin
+
   17 Nov 2007; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh:
   Force dmraid to be built with -j1 for bug #188273
 
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 1b24b25..79eed73 100644
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -408,8 +408,15 @@ append_auxilary() {
 			rm -f ${TEMP}/initramfs-aux-temp/sbin/cryptsetup
 			cp /bin/cryptsetup ${TEMP}/initramfs-aux-temp/sbin/cryptsetup
 			chmod +x "${TEMP}/initramfs-aux-temp/sbin/cryptsetup"
+		elsif is_static /sbin/cryptsetup
+		then
+			print_info 1 "Including LUKS support"
+			rm -f ${TEMP}/initramfs-aux-temp/sbin/cryptsetup
+			cp /sbin/cryptsetup ${TEMP}/initramfs-aux-temp/sbin/cryptsetup
+		chmod +x "${TEMP}/initramfs-aux-temp/sbin/cryptsetup"
+
 		else
-			print_info 1 "LUKS support requires static cryptsetup at /bin/cryptsetup"
+			print_info 1 "LUKS support requires static cryptsetup at /bin/cryptsetup or /sbin/cryptsetup"
 			print_info 1 "Not including LUKS support"
 		fi
 	fi
diff --git a/gen_initrd.sh b/gen_initrd.sh
index 2d59bcc..e0341ae 100644
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -216,8 +216,14 @@ create_base_initrd_sys() {
 			rm -f ${TEMP}/initrd-temp/sbin/cryptsetup
 			cp /bin/cryptsetup ${TEMP}/initrd-temp/sbin/cryptsetup
 			chmod +x "${TEMP}/initrd-temp/sbin/cryptsetup"
+		elsif is_static /sbin/cryptsetup
+		then
+			print_info 1 "Including LUKS support"
+			rm -f ${TEMP}/initrd-temp/sbin/cryptsetup
+			cp /sbin/cryptsetup ${TEMP}/initrd-temp/sbin/cryptsetup
+			chmod +x "${TEMP}/initrd-temp/sbin/cryptsetup"
 		else
-			print_info 1 "LUKS support requires static cryptsetup at /bin/cryptsetup"
+			print_info 1 "LUKS support requires static cryptsetup at /bin/cryptsetup or /sbin/cryptsetup"
 			print_info 1 "Not including LUKS support"
 		fi
 	fi