Changeset 744 in MondoRescue for branches/stable/mindi/mindi

Timestamp:

Aug 5, 2006, 12:35:09 AM (18 years ago)

Author:

Bruno Cornec

Message:

With that version mindi --makemountlist works for RHEL4 + LVMv2 + LABEL

File:

• branches/stable/mindi/mindi (modified) (3 diffs)

branches/stable/mindi/mindi

@@ -1339 +1339 @@
     done
     [ "$IMAGE_DEVS" != "" ] && all_partitions="`echo "$all_partitions $IMAGE_DEVS" | tr ' ' '\n' | sort -u | tr '\n ' ' '`"
-    printf "        %-15s %-15s %-15s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)"
+    printf "        %-15s %-15s %-15s %-15s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)" LABEL
     useless_dev="/dev/floppy /dev/fd0h1440 /dev/fd0H1440 /dev/cdrom /dev/cdrom/cdrom /dev/cdrom/cdrom1 /dev/cdrom/cdrom2 /dev/cdrom0 /dev/cdrom1 /dev/cdrom2 /dev/cdrom3 /dev/cdrw /dev/scd /dev/ram :/ /dev/sr0 /dev/sr1 /dev/cdrom1"
     for c_p in $all_partitions ; do
@@ -1421 +1421 @@
 
         current_lvolume="$current_partition"
-        if [ $LVM = "v2" ] && [ -z "`$LVMCMD lvdisplay $current_partition 2> /dev/null`" ]; then
+        if [ $LVM = "v2" ] && [ "`$LVMCMD pvdisplay $current_partition 2> /dev/null`" ]; then
             partition_stub="`echo "$current_partition" | sed "s|^/dev/mapper/|/dev/|" | cut -d"-" -f1`"
             current_lvolume="`find /dev -lname "$current_partition" | grep "^$partition_stub"`"
@@ -1427 +1427 @@
         # End of LVM device style variation code (other than $current_lvolume).
 
-        if [ $LVM != "false" ] && [ "`$LVMCMD lvdisplay $current_lvolume 2> /dev/null`" ]; then
+        if [ $LVM != "false" ] && [ "`$LVMCMD pvdisplay $current_lvolume 2> /dev/null`" ]; then
             partition_size="lvm"
         else