Changeset 2428 in MondoRescue for branches/2.2.10/mindi

Timestamp:

Sep 28, 2009, 2:29:12 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Attempt to stay backward compatible without protocol for -n option
• Improving ssh support at restore time by providing a shadow file
• analyze-my-lvm now removes excluded devices from list coming from mondoarchive
• new mr_make_devlist_from_pathlist which handle the new bkpinfo->exclude_devs field containing the excluded devices and remove corresponding code from libmondo-cli.c
• Move DSF code into libmondo-devices.c for coherency, and only the previous function is made externally available
• Remove dev_to_exclude in libmondo-archive.c which wasn't working correctly and replace it with bkpinfo->exclude_devs
• Fix an issue in is_this_device_mounted (string freed before last usage)
• Adds support for bnx2x (BL 460 G6) and auth_rpcgss (Debian 2.6.31)

(Backport from 2.2.9)

Location:

branches/2.2.10/mindi

Files:

• analyze-my-lvm (modified) (1 diff)
• mindi (modified) (3 diffs)
• rootfs/etc/passwd (modified) (1 diff)
• rootfs/etc/shadow (copied) (copied from branches/2.2.9/mindi/rootfs/etc/shadow )

branches/2.2.10/mindi/analyze-my-lvm

@@ -177 +177 @@
 
 ListLvmDrivesAndPartitions() {
-    $LVMCMD vgdisplay -v 2> /dev/null | grep "PV Name" | sed 's/(#)//' | awk '{print $3}' > $MINDI_TMP/vg.tmp
-    if [ -f /etc/multipath.conf ]; then
-        # If multipath check which type of devidec are given, mpath prefered
-        for d in `cat  $MINDI_TMP/vg.tmp`; do
+    for d in `$LVMCMD vgdisplay -v 2> /dev/null | grep "PV Name" | sed 's/(#)//' | awk '{print $3}'`; do 
+        # Skip devices excluded, coming from mondoarchive
+        if [ "$EXCLUDE_DEVS" ] && [ "`echo " $EXCLUDE_DEVS " | grep " $d "`" ]; then
+            continue
+        fi
+        # If multipath check which type of devides are given, mpath prefered
+        if [ -f /etc/multipath.conf ]; then
             GiveMapperOfdm $d
-        done
-    else
-        cat $MINDI_TMP/vg.tmp
-    fi
-    rm -f $MINDI_TMP/vg.tmp
+        else
+            echo $d
+        fi
+    done
 }
 

branches/2.2.10/mindi/mindi

@@ -57 +57 @@
 PCMCIA_MODS="pcmcia_core ds yenta_socket"
 USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage input hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid keybdev mousedev libusual scsi_mod ff-memless"
-NET_MODS="sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 bnx2 e1000 e1000e igb eepro100 ne2k-pci tg3 libphy pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmnet exportfs fuse"
+NET_MODS="auth_rpcgss sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 bnx2 bnx2x e1000 e1000e igb eepro100 ne2k-pci tg3 libphy pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmnet exportfs fuse"
 CDROM_MODS="$TAPE_MODS $IDE_MODS $USB_MODS $PCMCIA_MODS $SCSI_MODS $NET_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_base nls_cp437 nls_utf8 sg sr_mod zlib_inflate iso9660"
 # Those modules will only go on the backup media, not the boot media.
@@ -979 +979 @@
             LVM="false"
         fi
-        all_partitions=`cat $MINDI_TMP/lvm.res | grep -F ">>>" | cut -d' ' -f2-32`
+        all_partitions=`cat $MINDI_TMP/lvm.res | grep -F ">>>" | cut -d' ' -f2-`
     fi
     all_partitions="$all_partitions `ListAllPartitions 2> /dev/null`"
@@ -2744 +2744 @@
         LAST_FILELIST_NUMBER=${12}
         ESTIMATED_TOTAL_NOOF_SLICES=${13}
-        EXCLUDE_DEVS="${14}"
+        export EXCLUDE_DEVS="${14}"
         USE_COMP="${15}"
         USE_LILO="${16}"

branches/2.2.10/mindi/rootfs/etc/passwd

@@ -16 +16 @@
 guest:x:405:100:guest:/dev/null:/dev/null
 nobody:x:65534:100:nobody:/dev/null:
-alfa::1001:0:alfa:/alfa: