Changeset 1883 in MondoRescue for branches/2.2.5/mindi

Timestamp:

Feb 6, 2008, 10:13:31 AM (16 years ago)

Author:

Bruno Cornec

Message:

ReadAllLink rewritten again to try to fix bug reports on ML. Needs more tests.

File:

• branches/2.2.5/mindi/mindi (modified) (3 diffs)

branches/2.2.5/mindi/mindi

@@ -1057 +1057 @@
     file="$1"
 
+    echo "$file"
     if [ ! -h $file ]; then
-        echo "$file"
         return 0
     fi
 
-    link=`readlink -f $file`
+    link=`readlink $file`
     d=`dirname $file`
-    if [ ! -e "$link" -a ! -e "$d/$link" ]; then
-        echo "Problem with dead link on $file -> $link" >> $LOGFILE
-    fi
+    fchar=`echo $link | cut -c1`
+    # If mother dir is a link print it
     if [ -h "$d" ]; then
-        echo "$link"
         echo "$d"
-    else
-        echo "$link"
+        d=`readlink $d`
+    fi
+    if [ "$fchar" != "/" ]; then
+        # Relative or local link
+        ReadAllLink "$d/$link" 
+    else
+        # Absolute path
+        ReadAllLink $link 
     fi
 }
@@ -1523 +1527 @@
         if [ ! "$partition_mountpt" ] ; then
             echo "------- $FDISK -l $qq log ------------" >> $LOGFILE
-            for qq in "" `find /dev/ida/c*d* ! -name '*p*'` 2> /dev/null; do
+            for qq in "" `find /dev/ida/c*d* ! -name '*p*' 2> /dev/null`; do
                 partition_format=`$FDISK -l $qq 2>> $LOGFILE | grep -w "$c_p" | sed 's/12/|/' | tr -s '\t' ' ' | cut -d'|' -f2 | cut -d' ' -f2-9`
                 [ "$partition_format" ] && break
@@ -2833 +2837 @@
     file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically" 
     if [ $? -eq 0 ]; then
-        LocateDeps $MINDI_LIB/rootfs/bin/busybox > $MINDI_TMP/busy.lis
+        LocateDeps $MINDI_LIB/rootfs/bin/busybox /bin/mount > $MINDI_TMP/busy.lis
         cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` .
         rm -f $MINDI_TMP/busy.lis