Changeset 794 for trunk/mindi/mindi


Ignore:
Timestamp:
Sep 14, 2006, 1:05:18 AM (14 years ago)
Author:
Bruno Cornec
Message:

merge -r781:793 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/mindi

    r782 r794  
    14591459            fi
    14601460
    1461             # 4th try : pre-formated LABEL. Format is : LABEL=SWAP-mydevice. e.g. : LABEL=SWAP-hda5
     1461            # 4th try : pre-formated LABEL. Format is : LABEL=SWAP-mydevice or SW-mydevice. e.g. : LABEL=SWAP-hda5
     1462            # LABEL=SW-cciss/c0d0p3 (RDP)
    14621463            # SWAP only
    1463             if [ "x$actual_dev" = "x" -a  _"`echo $current_partition | /bin/grep -i 'LABEL=SWAP'`" != _"" ]; then
     1464            if [ "x$actual_dev" = "x" -a  _"`echo $current_partition | /bin/grep -iE 'LABEL=SWAP|LABEL=SW-'`" != _"" ]; then
    14641465                try_dev="`echo "$redhat_label" | /bin/cut -d '-' -f2`"
    14651466                present_dev="`/bin/cat /proc/swaps | /bin/grep -w /dev/$try_dev`"
     
    14971498            current_lvolume="`find /dev -lname "$current_partition" | grep -Ev '^/dev/\.static/'`"
    14981499            echo $current_lvolume | grep -q ' '
    1499             if [ $? -eq 0]; then
     1500            if [ $? -eq 0 ]; then
    15001501                echo "WARNING: Multiple Logical Volumes found. Report to dev team" >> $LOGFILE 
    15011502            fi
Note: See TracChangeset for help on using the changeset viewer.