Changeset 1927 in MondoRescue for branches/2.2.6/mindi/mindi

Timestamp:

Apr 18, 2008, 2:59:01 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Fixing broken NFS support in 2.2.5 for rhel5 where additional command like mount.nfs is needed
• Need to loopback mount when using NFS (wasn't needed with busybox version)
• Fix broken udev support introduced by fixing non-udev support during 2.2.6

File:

• branches/2.2.6/mindi/mindi (modified) (13 diffs)

branches/2.2.6/mindi/mindi

@@ -64 +64 @@
 IDE_MODS="ide ide-floppy floppy ide-generic ide-detect ide-mod ide-disk ide_disk ide-cd ide_cd ide-cs ide-core ide_core edd paride ata_generic ata_piix libata via82cxxx generic nvidia ahci sata_nv cmd64x pata_amd pata_marvell pata_serverworks"
 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"
+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"
 CDROM_MODS="$TAPE_MODS $IDE_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_base nls_cp437 nls_utf8 sg sr_mod zlib_inflate iso9660 $USB_MODS $PCMCIA_MODS"
 NET_MODS="sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmnet"
@@ -168 +168 @@
 
     mkdir -p $bigdir/etc
-    #cp --parents -pRdf $mappath $bigdir 2>> $LOGFILE || LogIt "AKMF -- Could not copy $mappath to $bigdir"
     tar cf - $mappath 2>> /dev/null | (cd $bigdir ; tar xf -) || LogIt "AKMF -- Could not copy $mappath to $bigdir"
     if [ "`echo $mappath | grep -F ".gz"`" ] ; then
@@ -278 +277 @@
                 BIGNO=$(($BIGNO+1))
             else
-                #cp --parents -Rdf $incoming $outdir 2> /dev/null || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
                 tar cf - $incoming 2> /dev/null | (cd $outdir ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
     
@@ -1996 +1994 @@
         cd $MINDI_TMP
         for i in `ListKernelModulePaths | HackPathsToFailsafe` ; do
-            #cp --parents -pRdf ./$i $bigdir 2>> $LOGFILE || Die "PDDI can't cp $i->$bigdir"
             tar cf - ./$i 2>> $LOGFILE | (cd $bigdir ; tar xf -) || Die "PDDI can't copy $i->$bigdir"
             if [ "`du -sk $i | cut -f1`" -lt "$(($CHOPSIZE*2))" ] ; then
-                #cp --parents -pRdf $i $bigdir 2>> $LOGFILE
                 tar cf - $i 2>> $LOGFILE | (cd $bigdir ; tar xf -)
             else
@@ -2011 +2007 @@
             for k in $j ; do
                 if [ "`du -sk $k | cut -f1`" -lt "$CHOPSIZE" ] ; then
-                    #cp --parents -pRdf $k $bigdir 2>> $LOGFILE
                     tar cf - $k 2>> $LOGFILE | (cd $bigdir ; tar xf -)
                 else
@@ -2387 +2382 @@
         s=`which $w 2> /dev/null`
         if [ -e "$s" ] ; then
-            #cp --parents -af $s . 2>> $LOGFILE
             tar cf - $s 2> /dev/null | tar xf -
         fi
@@ -2397 +2391 @@
     file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically" 
     if [ $? -eq 0 ]; then
-        # We want to use the real mount
-        rm -f bin/mount
-        LocateDeps $MINDI_LIB/rootfs/bin/busybox /bin/mount > $MINDI_TMP/busy.lis
-        #cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` .
-        tar cf - /bin/mount `sort -u $MINDI_TMP/busy.lis` 2> /dev/null | tar xf -
+        # We want to use the real mount and all the supported variants (nfs, cifs, ...)
+        rm -f bin/mount $MINDI_TMP/busy.lis
+        mountlis=`grep mount $DEPLIST_FILE`
+        for f in $MINDI_LIB/rootfs/bin/busybox $mountlis ; do
+            if [ -f $f ]; then
+                LocateDeps $f >> $MINDI_TMP/busy.lis
+            fi
+        done
+        tar cf - $mountlis `sort -u $MINDI_TMP/busy.lis` 2> /dev/null | tar xf -
         rm -f $MINDI_TMP/busy.lis
     fi
@@ -2411 +2409 @@
         echo "udev device manager found" > $mountpoint/tmp/USE-UDEV
         LogIt "udev device manager found"
-        #cp --parents -Rdf /etc/udev . 2> /dev/null
         tar cf - /etc/udev 2> /dev/null | tar xf -
         # This avoids NIC remapping if on another machine at restore time on Debian at least
         rm -f ./etc/udev/rules.d/z25_persistent-net.rules
-        #cp --parents -Rdf /lib/udev /lib64/udev . 2> /dev/null
         tar cf - /lib*/udev 2> /dev/null | tar xf -
         if [ -x /sbin/udevd ]; then
@@ -2442 +2438 @@
                 fi
             done
-            #cp --parents -Rdf $lis `sort -u $MINDI_TMP/udev.lis` .
             tar cf - $lis `sort -u $MINDI_TMP/udev.lis` 2> /dev/null | tar xf -
             rm -f $MINDI_TMP/udev.lis
@@ -2461 +2456 @@
             lis=`grep -Ev '^#' $MINDI_CACHE/tools.files` 
             LocateDeps $lis > $MINDI_TMP/tools.lis
-            #cp --parents -Rdf $lis `sort -u $MINDI_TMP/tools.lis` .
             tar cf - $lis `sort -u $MINDI_TMP/tools.lis` 2> /dev/null | tar xf -
         fi
@@ -2481 +2475 @@
     fi
 
-    #cp --parents -Rdf /dev/fd0*[1,2][4,7,8]* . 2> /dev/null
     tar cf - /dev/fd0*[1,2][4,7,8]* 2> /dev/null | tar xf -
 
@@ -2524 +2517 @@
         [ "$YOUR_KERNEL_SUCKS" ] && i=$MINDI_TMP/$i
         echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
-        #cp --parents -Rpdf $i $mountpoint 2>/dev/null || LogIt "Unable to copy $i to $mountpoint"
         tar cf - $i 2>/dev/null | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy $i to $mountpoint"
         # Uncompress modules if not using udev and native modprobe
@@ -2536 +2528 @@
 
     # Also copy modules.dep in case of udev so that normal modprobe works
-    #cp --parents -Rpdf /$needed_modules_path/modules.dep $mountpoint 2>/dev/null || LogIt "Unable to copy modules.dep to $mountpoint"
     tar cf - /$needed_modules_path/modules.dep 2>/dev/null | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy modules.dep to $mountpoint"