Changeset 3357 in MondoRescue

Timestamp:

Mar 5, 2015, 9:54:31 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Fix mindi for RHEL5 support (as well as lots of older distros) by avoiding using option -n of cp not portable, creating a /bin subdir in case it's needed, creating a link for /sbin/init if needed

File:

• branches/3.2/mindi/mindi (modified) (6 diffs)

branches/3.2/mindi/mindi

@@ -71 +71 @@
 USB_MODS="usb-storage usb_storage usb-ohci usb-uhci input hid hid_generic uhci_hcd uhci-hcd ehci-hcd ehci-pci ohci-hcd ohci_hcd ohci-pci xhci xhci-hcd usbkbd usbhid keybdev mousedev scsi_mod ff-memless ums_cypress ums-cypress cp210x usbserial"
 NET_MODS="nfs nfsv2 nfsv3 nfsv4 nfsd loop mii 3c59x e100 bcm5700 cnic be2net bnx2 bnx2x bnx2i mdio e1000 e1000e igb dca eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmxnet3 vmnet exportfs fuse netbk xenblktap r8169 virtio_net via_rhine ipv6 ptp"
-CDROM_MODS="$TAPE_MODS $IDE_MODS $USB_MODS $PCMCIA_MODS $SCSI_MODS $NET_MODS cdrom isocd isofs sg sr_mod iso9660 nls_iso8859-1 vfat fat loop md-mod lvm-mod dm-mod dm_mod dm-multipath dm-emc dm-hp-sw dm-rdac dm-region-hash multipath jfs xfs btrfs reiserfs ext2 ext3 minix nfs nfsd ext4 ocfs2 configfs vxfs "
+CDROM_MODS="$TAPE_MODS $IDE_MODS $USB_MODS $PCMCIA_MODS $SCSI_MODS $NET_MODS cdrom isocd isofs sg sr_mod iso9660 nls_iso8859-1 vfat fat loop md-mod lvm-mod dm-mod dm_mod dm-multipath dm-emc dm-hp-sw dm-rdac dm-region-hash multipath jfs xfs btrfs reiserfs ext2 ext3 minix nfs nfsd ext4 ocfs2 configfs vxfs nls_utf8"
 # Replace with that line for HP OCMP e.g.
 #DENY_MODS="MPS_Driver_Mapper mps octtldrv tscttl streams kqemu fdomain"
@@ -253 +253 @@
     fi
 
-    #cp -a -n --parents -t $mappath $bigdir 2>> $MINDI_TMP/$$.log || LogAll "WARNING: AKMF -- Could not copy $mappath to $bigdir" $MINDI_TMP/$$.log
     tar cf - -C / $mappath 2>> $MINDI_TMP/$$.log | (cd "$bigdir" ; tar xf -) || LogAll "WARNING: AKMF -- Could not copy $mappath to $bigdir" $MINDI_TMP/$$.log
     if [ "`echo $mappath | grep -F ".gz"`" ] ; then
@@ -2399 +2398 @@
         fi
     fi
-    LogAll "TryToFindKernelPath found $output"
+    #LogAll "TryToFindKernelPath found $output"
     echo "$output"
 }
@@ -2441 +2440 @@
         fi
     done
+
     LogFile "INFO: what is now in $mountpoint"
     ls -alR $mountpoint >> $LOGFILE
     
     # Check files before copying to discover configuration issues or McAfee preventing mindi reading these files
+    # copy from rootfs into mountpoint
     for f in $tgz_dir_fname/*; do 
         if [ ! -r $f ]; then
             Die "ERROR: Unable to copy $f to the target dir. Check your installation or McAfee presence"
         else
-            cp -Rdf $f . 2>&1 >> $LOGFILE
+            cp -af $f . 2>&1 >> $LOGFILE
         fi
     done
@@ -2512 +2513 @@
     for f in `sort -u $MINDI_TMP/minimal.lis`; do
         if [ -e $f -a ! -d $f ] || [ -h $f ]; then
-            finallist="$finallist $f"
+            # Do not overwrite files already in destination (avoid using option -n of cp not portable)
+            if [ ! -e "$mountpoint/$f" ]; then
+                finallist="$finallist $f"
+            fi
         fi
     done
+    rm -f $MINDI_TMP/minimal.lis $MINDI_TMP/minimal2.lis
+
     #tar cf - $finallist 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "WARNING: Problem in minimal analysis" $MINDI_TMP/$$.log
-    echo "cp -a -n --parents $finallist -t $mountpoint" 2>&1 >> $MINDI_TMP/$$.log
-    cp -a -n --parents $finallist -t $mountpoint 2>> $MINDI_TMP/$$.log || LogIt "WARNING: Problem in minimal analysis" $MINDI_TMP/$$.log
+    echo "INFO: Copy the minimal env with cp -a --parents $finallist -t $mountpoint" 2>&1 >> $MINDI_TMP/$$.log
+    cp -a --parents $finallist -t $mountpoint 2>> $MINDI_TMP/$$.log || LogIt "WARNING: Problem in minimal analysis" $MINDI_TMP/$$.log
+
+    # In case target /bin dir still doesn't exist, create it before using it
+    if [ ! -d $mountpoint/bin ]; then
+        mkdir -p $mountpoint/bin
+    fi
+
+    # For older distributions expecting /sbin/init provides it
+    if [ ! -e sbin/init ]; then
+        (cd sbin ; ln -sf ../usr/sbin/init .)
+    fi
 
     # To improve support for distribution scripts, we now prefer to use bash as the std shell. Also fixes #600
     ln -sf /bin/bash bin/sh
     LogIt "INFO: Using bash as default shell"
-    rm -f $MINDI_TMP/minimal.lis $MINDI_TMP/minimal2.lis
 
     # Avoids an issue on some distro (RHEL5)
@@ -2581 +2596 @@
             for f in `sort -u $MINDI_TMP/udev.lis`; do
                 if [ -e $f -a ! -d $f ] || [ -h $f ]; then
-                    finallist="$finallist $f"
+                    # Do not overwrite files already in destination (avoid using option -n of cp not portable)
+                    if [ ! -e "$mountpoint/$f" ]; then
+                        finallist="$finallist $f"
+                    fi
                 fi
             done
             #tar cf - -C / $lis `sort -u $MINDI_TMP/udev.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "ERROR: Problem in udev.lis analysis" $MINDI_TMP/$$.log
-            echo "cp -a -n --parents $finallist -t $mountpoint/" 2>&1 >> $MINDI_TMP/$$.log
-            cp -a -n --parents $finallist -t $mountpoint/ 2>> $MINDI_TMP/$$.log  || LogIt "ERROR: Problem in udev.lis analysis" $MINDI_TMP/$$.log
+            echo "INFO: Copying udev related files with cp -a --parents $finallist -t $mountpoint/" 2>&1 >> $MINDI_TMP/$$.log
+            cp -a --parents $finallist -t $mountpoint/ 2>> $MINDI_TMP/$$.log  || LogIt "ERROR: Problem in udev.lis analysis" $MINDI_TMP/$$.log
             rm -f $MINDI_TMP/udev.lis
         else