Changeset 3075 in MondoRescue for branches/3.0/mindi/mindi

Timestamp:

Nov 23, 2012, 11:50:01 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Handle better the symlinks during the copy of content in order to support the /lib issue for F17. To be tested. Works natively on Mandriva 2010.

File:

• branches/3.0/mindi/mindi (modified) (2 diffs)

branches/3.0/mindi/mindi

@@ -277 +277 @@
 
 CopyDependenciesToDirectory() {
-    local outdir incoming fname counter d found
+    local outdir incoming counter d found tdir
     outdir=$1
     mkdir -p $outdir
@@ -296 +296 @@
             d=`dirname "$d"`
         done
-        if [ -d "$incoming" ] && [ ! -h "$incoming" ]; then
+        if [ -d "$incoming" ]; then
             find $incoming/* -maxdepth 0 2> /dev/null | CopyDependenciesToDirectory $outdir
         elif [ -e "$incoming" ] && [ $found = "false" ]; then
-            tar cf - -C / $incoming 2>> $MINDI_TMP/$$.log | (cd "$outdir" ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?" $MINDI_TMP/$$.log
-
+            if [ ! -h "$incoming" ]; then
+                tar cf - -C / $incoming 2>> $MINDI_TMP/$$.log | (cd "$outdir" ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?" $MINDI_TMP/$$.log
+            else
+                tdir=`dirname "$incoming"`
+                if [ ! -e "$outdir/$tdir" ]; then
+                    mkdir -p "$outdir/$tdir"
+                fi
+                cp --no-dereference --preserve=all $incoming "$outdir/$tdir"
+            fi
             # Only uncompress modules if not using udevd
             if [ "`echo "$incoming" | grep "lib/modules/.*\..*o\.gz"`" != "" ] && [ "`ps auxww | grep -v grep | grep -qw udevd`" != "" ]; then
                 gunzip -f $outdir/$incoming || LogIt "WARNING: Cannot gunzip $outdir/$incoming"
             fi
-            [ -x "$outdir" ] && StripExecutable $outdir "-$filename-"
+            [ -x "$outdir" ] && StripExecutable $outdir
             counter=$(($counter+1))
             if [ "$counter" -ge "5" ] ; then