Changeset 1883


Ignore:
Timestamp:
Feb 6, 2008, 10:13:31 AM (12 years ago)
Author:
bruno
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mindi/mindi

    r1882 r1883  
    10571057    file="$1"
    10581058
     1059    echo "$file"
    10591060    if [ ! -h $file ]; then
    1060         echo "$file"
    10611061        return 0
    10621062    fi
    10631063
    1064     link=`readlink -f $file`
     1064    link=`readlink $file`
    10651065    d=`dirname $file`
    1066     if [ ! -e "$link" -a ! -e "$d/$link" ]; then
    1067         echo "Problem with dead link on $file -> $link" >> $LOGFILE
    1068     fi
     1066    fchar=`echo $link | cut -c1`
     1067    # If mother dir is a link print it
    10691068    if [ -h "$d" ]; then
    1070         echo "$link"
    10711069        echo "$d"
    1072     else
    1073         echo "$link"
     1070        d=`readlink $d`
     1071    fi
     1072    if [ "$fchar" != "/" ]; then
     1073        # Relative or local link
     1074        ReadAllLink "$d/$link"
     1075    else
     1076        # Absolute path
     1077        ReadAllLink $link
    10741078    fi
    10751079}
     
    15231527        if [ ! "$partition_mountpt" ] ; then
    15241528            echo "------- $FDISK -l $qq log ------------" >> $LOGFILE
    1525             for qq in "" `find /dev/ida/c*d* ! -name '*p*'` 2> /dev/null; do
     1529            for qq in "" `find /dev/ida/c*d* ! -name '*p*' 2> /dev/null`; do
    15261530                partition_format=`$FDISK -l $qq 2>> $LOGFILE | grep -w "$c_p" | sed 's/12/|/' | tr -s '\t' ' ' | cut -d'|' -f2 | cut -d' ' -f2-9`
    15271531                [ "$partition_format" ] && break
     
    28332837    file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically"
    28342838    if [ $? -eq 0 ]; then
    2835         LocateDeps $MINDI_LIB/rootfs/bin/busybox > $MINDI_TMP/busy.lis
     2839        LocateDeps $MINDI_LIB/rootfs/bin/busybox /bin/mount > $MINDI_TMP/busy.lis
    28362840        cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` .
    28372841        rm -f $MINDI_TMP/busy.lis
Note: See TracChangeset for help on using the changeset viewer.