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

Timestamp:

Apr 14, 2008, 12:10:45 PM (16 years ago)

Author:

Bruno Cornec

Message:

Replacement of cp --parents which may not work correctly with symlinks with tar c | tar x which is always working correctly for that.

File:

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

branches/2.2.6/mindi/mindi

@@ -2445 +2445 @@
         s=`which $w 2> /dev/null`
         if [ -e "$s" ] ; then
-            cp --parents -af $s . 2>> $LOGFILE
+            #cp --parents -af $s . 2>> $LOGFILE
+            tar cf - $s | tar xf - 2> /dev/null
         fi
     done
@@ -2458 +2459 @@
     if [ $? -eq 0 ]; then
         LocateDeps $MINDI_LIB/rootfs/bin/busybox /bin/mount > $MINDI_TMP/busy.lis
-        cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` .
+        #cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` .
+        tar cf - `sort -u $MINDI_TMP/busy.lis` | tar xf - 2> /dev/null
         rm -f $MINDI_TMP/busy.lis
     fi
@@ -2467 +2469 @@
         echo "udev device manager found" > tmp/USE-UDEV
         LogIt "udev device manager found"
-        cp --parents -Rdf /etc/udev . 2> /dev/null
+        #cp --parents -Rdf /etc/udev . 2> /dev/null
+        tar cf - /etc/udev | tar xf - 2> /dev/null
         # 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
+        #cp --parents -Rdf /lib/udev /lib64/udev . 2> /dev/null
+        tar cf - /lib*/udev | tar xf - 2> /dev/null
         if [ -x /sbin/udevd ]; then
             lis2=`grep -Ev '^#' $MINDI_CONF/udev.files` 
@@ -2496 +2500 @@
                 fi
             done
-            cp --parents -Rdf $lis `sort -u $MINDI_TMP/udev.lis` .
+            #cp --parents -Rdf $lis `sort -u $MINDI_TMP/udev.lis` .
+            tar cf - $lis `sort -u $MINDI_TMP/udev.lis` | tar xf - 2> /dev/null
             rm -f $MINDI_TMP/udev.lis
         else
@@ -2514 +2519 @@
             lis=`grep -Ev '^#' $MINDI_CACHE/tools.files` 
             LocateDeps $lis > $MINDI_TMP/tools.lis
-            cp --parents -Rdf $lis `sort -u $MINDI_TMP/tools.lis` .
+            #cp --parents -Rdf $lis `sort -u $MINDI_TMP/tools.lis` .
+            tar cf - $lis `sort -u $MINDI_TMP/tools.lis` | tar xf - 2> /dev/null
         fi
         if [ -f $MINDI_CACHE/mindi-rsthw ]; then
@@ -2533 +2539 @@
     fi
 
-    cp --parents -Rdf /dev/fd0*[1,2][4,7,8]* . 2> /dev/null
+    #cp --parents -Rdf /dev/fd0*[1,2][4,7,8]* . 2> /dev/null
+    tar cf - /dev/fd0*[1,2][4,7,8]* | tar xf - 2> /dev/null
 
     cd $old_pwd
@@ -2576 +2583 @@
         [ "$YOUR_KERNEL_SUCKS" ] && i=$MINDI_TMP/$i
         echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
-        cp --parents -pdf $i $mountpoint 2>/dev/null || LogIt "Unable to copy $i to $mountpoint"
+        #cp --parents -Rpdf $i $mountpoint 2>/dev/null || LogIt "Unable to copy $i to $mountpoint"
+        tar cf - $i | (cd $mountpoint ; tar xf -) 2>/dev/null || LogIt "Unable to copy $i to $mountpoint"
         # Uncompress modules if not useing udev and native modprobe
         if [ ! -f $mountpoint/tmp/USE-UDEV ]; then
@@ -2587 +2595 @@
 
     # Also copy modules.dep in case of udev so that normal modprobe works
-    cp --parents -pdf /$needed_modules_path/modules.dep $mountpoint 2>/dev/null || LogIt "Unable to copy modules.dep to $mountpoint"
+    #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 | (cd $mountpoint ; tar xf -) 2>/dev/null || LogIt "Unable to copy modules.dep to $mountpoint"
 
     # For all modules supported, create symlinks under the mountpoint