diff --git a/packer/initramfs/labsync b/packer/initramfs/labsync
index 6043cc6..779099c 100755
--- a/packer/initramfs/labsync
+++ b/packer/initramfs/labsync
@@ -102,10 +102,10 @@ labsync_mount_root() {
 
 		dmsetup ls --tree
 
-		lvm vgs -o NAME --noheadings | while read vg; do
-			if [ "$vg" != "$vg_name" ]; then
-				lvm vgchange -an "$vg"
-				find /dev -mindepth 1 -maxdepth 1 -name "$vg" -exec dmsetup remove '{}' \;
+		lvm pvs -o PV_NAME,VG_NAME --noheadings | while read pv vg; do
+			if echo "$pv" | grep -q "^/dev/${labsync_disk}"; then
+				lvm vgchange -a n "$vg"
+				lvm vgexport $vg
 			fi
 		done
 
@@ -121,9 +121,7 @@ unit: sectors
 /dev/${labsync_disk}2 : start=$start_part_2, size=     $size_part_2, type=8e
 PARTTABLE
 
-		while ! blockdev --rereadpt /dev/${labsync_disk}; do
-			sleep 1
-		done
+		lvm vgimport -a
 
 		labsync_info "Doing lvm stuff"
 		pv_device="/dev/${labsync_disk}2"