Changeset 3204 in MondoRescue

Timestamp:

Dec 6, 2013, 3:40:43 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix mindi support for /bin,/sbin,/lib symlinks to /usr. Works on Mageia 3 at least. Still some error msgs are reported in logs but are harmless

File:

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

branches/3.2/mindi/mindi

@@ -910 +910 @@
     if [ -h "$d" ]; then
         echo "$d"
-        echo "$d/`basename $file`"
         d2=`readlink $d`
         c2=`echo $d2 | cut -c1`
@@ -920 +919 @@
             fi
         fi
+        echo "$d/`basename $file`"
     fi
     if [ "$fchar" != "/" ]; then
@@ -2545 +2545 @@
     # Copy of files mandatory for ssh to automate mount if sshfs is used
     mkdir $mountpoint/.ssh
-    cp -rp ~root/.ssh/* $mountpoint/.ssh 2> /dev/null
+    cp -a ~root/.ssh/* $mountpoint/.ssh 2> /dev/null
     echo > $mountpoint/tmp/myssh << EOF
 ssh -o StrictHostKeyChecking=no $*
@@ -2552 +2552 @@
 
     # Copy of files mandatory for ld.so
-    cp -rp /etc/ld.so.c* $mountpoint/etc
+    cp -a /etc/ld.so.c* $mountpoint/etc
 
     # Handle the case where busybox and mount are dynamically linked
@@ -2574 +2574 @@
     # Initial / are trucated by tar
     finallist=""
-    # Remove directories from the list, as tar will create them anyway
+    # Remove directories from the list, as tar/cp will create them anyway
     # and it may hurt if /lib is in it as on Debian/Ubuntu
     # recent bash says that -d is true for a link to a dir !
@@ -2583 +2583 @@
     done
     #tar cf - $finallist 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "WARNING: Problem in minimal analysis" $MINDI_TMP/$$.log
-    cp -a --parents $finallist . 2>> $MINDI_TMP/$$.log || 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
 
     # To improve support for distribution scripts, we now prefer to use bash as the std shell. Also fixes #600
@@ -2600 +2601 @@
         LogIt "INFO: udev device manager found"
         tar cf - -C / /etc/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogIt "ERROR: Problem in /etc/udev analysis" $MINDI_TMP/$$.log
-        # This avoids NIC remapping if on another machine at restore time on Debian at least
-        rm -f ./etc/udev/rules.d/z[0-9][0-9]_persistent-net.rules
-        # This avoids NIC remapping if on another machine at restore time on Ubuntu at least
-        rm -f ./etc/udev/rules.d/[0-9][0-9]-persistent-net.rules
+        # This avoids NIC remapping if on another machine at restore time on Debian/Ubuntu at least
+        rm -f ./etc/udev/rules.d/[z]*[0-9][0-9][-_]persistent-net.rules
         # Do not do it if it's a link (Ubuntu 64 bits #503)
         if [ -e "/lib64/udev" ] && [ ! -h "/lib64" ] && [ ! -h "/lib64/udev" ]; then
@@ -2624 +2623 @@
                     while [ -h $j ]; do
                         lis="$lis $j"
-                        j=`readlink $j`
+                        j=`readlink -f $j`
                     done
                     lis="$lis $j"
@@ -2638 +2637 @@
                     [ "$j" != "" ] && rm -f $j
                 fi
+                echo "$i" >> $MINDI_TMP/udev.lis
             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
-            cp --parents -a $lis `sort -u $MINDI_TMP/udev.lis` 2>> $MINDI_TMP/$$.log $mountpoint/  || LogIt "ERROR: Problem in udev.lis analysis" $MINDI_TMP/$$.log
+            echo "cp -a -n --parents `sort -u $MINDI_TMP/udev.lis` -t $mountpoint/" 2>&1 >> $MINDI_TMP/$$.log
+            cp -a -n --parents `sort -u $MINDI_TMP/udev.lis` -t $mountpoint/ 2>> $MINDI_TMP/$$.log  || LogIt "ERROR: Problem in udev.lis analysis" $MINDI_TMP/$$.log
             rm -f $MINDI_TMP/udev.lis
         else