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

Timestamp:

Jul 25, 2013, 10:01:05 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix mindi for Mageia 3 with no /bin and /lib under / but relocated under /usr (should also fix #656 for Fedora)

File:

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

branches/3.0/mindi/mindi

@@ -297 +297 @@
             d=`dirname "$d"`
         done
-        if [ -d "$incoming" ]; then
+        if [ -d "$incoming" -a ! -h "$incoming" ]; then
             find $incoming/* -maxdepth 0 2> /dev/null | CopyDependenciesToDirectory $outdir 0
         elif [ -e "$incoming" ] && [ $found = "false" ]; then
@@ -903 +903 @@
     link=`readlink $file`
     d=`dirname $file`
+    # Is link a relative or full path name
     fchar=`echo $link | cut -c1`
     # If mother dir is a link print it
     if [ -h "$d" ]; then
         echo "$d"
-        d=`readlink $d`
+        d2=`readlink $d`
+        c2=`echo $d2 |  | cut -c1`
+        if [ "$c2" != "/" ]; then
+            if [ "$c2" != "." ]; then
+                d="/$d2"
+            else
+                d="$d/$d2"
+            fi
+        fi
     fi
     if [ "$fchar" != "/" ]; then
@@ -2103 +2112 @@
         cp -f $MINDI_TMP/mondo-restore.cfg $bigdir/tmp &> /dev/null
     fi
-    [ -d "/mnt/.boot.d" ] && echo "Oh Jebus" > $bigdir/tmp/DUMBASS-GENTOO
+    [ -d "/mnt/.boot.d" ] && echo "GENTOO" > $bigdir/tmp/DUMBASS-GENTOO
     DropOptimizedLibraries $needlist $bigdir
     echo -en "Assembling dependency files"
@@ -2565 +2574 @@
     # Remove directories from the list, as tar 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 !
     for f in `sort -u $MINDI_TMP/minimal.lis`; do
-        if [ ! -d $f ]; then
+        if [ -e $f -a ! -d $f ] || [ -h $f ]; then
             finallist="$finallist $f"
         fi
@@ -2724 +2734 @@
     for d in "/lib" "/usr/lib"; do
         if [ -d "$d/firmware" ]; then
-            cp -rp "$d/firmware" "$mountpoint/$d"
+            cp -a "$d/firmware" "$mountpoint/$d"
         fi
     done
@@ -2731 +2741 @@
     for d in "/lib" "/usr/lib" "/lib64" "/usr/lib64"; do
         if [ -d "$d/multipath" ]; then
-            cp -rp "$d/multipath" "$mountpoint/$d"
+            cp -a "$d/multipath" "$mountpoint/$d"
         fi
     done