Changeset 2529


Ignore:
Timestamp:
Jan 8, 2010, 12:23:27 PM (10 years ago)
Author:
bruno
Message:

r3745@localhost: bruno | 2010-01-08 10:53:15 +0100

  • Do not report Duplicate mount point when lvm is used
  • each device of the EXCLUDE_DEVS list is now used correctly and partitions found on this device are excluded
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.9/mindi/mindi

    r2503 r2529  
    12671267            fi
    12681268        fi
    1269         if [ "$EXCLUDE_DEVS" ] && [ "`echo " $EXCLUDE_DEVS " | grep -F " $current_partition "`" ] || [ "`echo " $EXCLUDE_DEVS " | grep " $current_partition "`" ] ; then
    1270             echo "Excluding $current_partition from mountlist" >> $LOGFILE
    1271             continue
     1269        if [ "$EXCLUDE_DEVS" ] ; then
     1270            for d in "$EXCLUDE_DEVS" ; do
     1271                if  [ "`echo " $current_partition " | grep " $d"`" != "" ]; then
     1272                    echo "Excluding $current_partition from mountlist (due to excluded device $d)" >> $LOGFILE
     1273                    continue
     1274                fi
     1275            done
    12721276        fi
    12731277        if [ ! "$partition_mountpt" ] ; then
     
    13241328    local file=$1
    13251329    # Coherency verification
    1326     ML0=`cat $file | wc -l`
     1330    ML01=`cat $file | wc -l`
     1331    ML02=`cat $file | grep -v ' lvm ' | wc -l`
    13271332    ML1=`$AWK '{print $1}' $file | sort -u | wc -l`
    1328     ML2=`$AWK '{print $2}' $file | sort -u | wc -l`
    1329     if [ "$ML0" -ne "$ML1" ]; then
     1333    ML2=`$AWK '{print $2}' $file | grep -v ' lvm ' | sort -u | wc -l`
     1334    if [ "$ML01" -ne "$ML1" ]; then
    13301335        echo "--------------------------------------------" >> $LOGFILE
    13311336        echo "WARNING: Duplicate device entry in mountlist" | tee -a $LOGFILE
    13321337        echo "--------------------------------------------" >> $LOGFILE
    13331338    fi
    1334     if [ "$ML0" -ne "$ML2" ]; then
     1339    if [ "$ML02" -ne "$ML2" ]; then
    13351340        echo "--------------------------------------------" >> $LOGFILE
    13361341        echo "WARNING: Duplicate mountpoint entry in mountlist" | tee -a $LOGFILE
Note: See TracChangeset for help on using the changeset viewer.