--- lvm.rc-2.02.95-r2	2012-05-27 08:05:22.000000000 +0100
+++ lvm.rc-2.02.95-r2	2012-10-09 12:27:19.929089534 +0100
@@ -73,7 +73,7 @@ 
 	einfo "Shutting down the Logical Volume Manager"
 	
 
-        VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix 2> /dev/null)
+        VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null)
 
         if [ "$VGS" ]
         then
@@ -83,8 +83,8 @@ 
 			# Extra PV find pass because some devices might not have been available until very recently
 			lvm_commands="${lvm_commands}lvchange --sysinit -a ln ${VGS}\n"
 			# Now make the nodes
-			lvm_commands="${lvm_commands}vgchange --sysinit -a ln\n"
+			lvm_commands="${lvm_commands}vgchange --sysinit -a ln  ${VGS}\n"
 			# Order of this is important, have to work around dash and LVM readline
 			printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
 			eend $? "Failed"
         fi