--- /usr/share/initramfs-tools/scripts/local-top/cryptroot.original	2006-11-19 13:39:37.000000000 -0600
+++ /usr/share/initramfs-tools/scripts/local-top/cryptroot	2006-11-19 13:40:54.000000000 -0600
@@ -5,10 +5,11 @@
 #
 prereqs()
 {
-	# Make sure that cryptroot is run last in local-top
+	# run cryptroot after everything but lvm
+        # Eli Criffield <launchpad@zendo.net>
 	for req in /scripts/local-top/*; do
 		script=$(basename $req)
-		[ $script != cryptroot ] && echo $script
+		[ $script != cryptroot -a $script != lvm ] && echo $script
 	done
 }
 
@@ -96,7 +97,7 @@
 	vg=$1
 
 	# Sanity checks
-	if [ ! -x /sbin/vgchange ]; then
+	if [ ! -x /sbin/lvm ]; then
 		return 1
 	fi
 
@@ -120,7 +121,7 @@
 	# Reduce padded --'s to -'s
 	vg=$(echo ${vg} | sed -e 's#--#-#g')
 
-	vgchange -ay ${vg}
+	lvm vgchange -ay ${vg}
 	return $?
 }