SVN: geninitrd/trunk/geninitrd

[glen]

Author: glen
Date: Mon Nov 10 03:36:09 2008
New Revision: 9979

Modified:
   geninitrd/trunk/geninitrd
Log:
- use /bin/cryptsetup on initrd

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Mon Nov 10 03:36:09 2008
@@ -1305,7 +1305,7 @@
 			if [ -n "$opt" ]; then
 				warn "$dst: options are invalid for LUKS partitions, ignoring them"
 			fi
-			echo "/sbin/cryptsetup ${key:+-d $key} luksOpen '$src' '$dst' <&1" | add_linuxrc
+			echo "cryptsetup ${key:+-d $key} luksOpen '$src' '$dst' <&1" | add_linuxrc
 		else
 			die "$dst: only LUKS encryption supported"
 		fi
@@ -1317,8 +1317,8 @@
 		die "/sbin/cryptsetup-initrd is missing!"
 	fi
 
-	inst_d /sbin
-	inst_exec /sbin/cryptsetup-initrd /sbin/cryptsetup
+	inst_d /bin
+	inst_exec /sbin/cryptsetup-initrd /bin/cryptsetup
 
 	mount_dev
 	mount_sys