Changeset 1009


Ignore:
Timestamp:
Dec 21, 2006, 5:30:20 PM (13 years ago)
Author:
bruno
Message:
  • UUID and LABELS are now both correctly handled by mindi (it's one or the other so only a single else case)
  • LABEL SWAP are working again.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/mindi

    r1008 r1009  
    12821282                    do
    12831283                        # Location of the swap label for kernel 2.6
    1284                         try_dev_label=`dd bs=1 count=16 skip=1052 if=$try_dev &> /dev/null`
     1284                        try_dev_label=`dd bs=1 count=16 skip=1052 if=$try_dev 2> /dev/null`
    12851285                        if [ "x$try_dev_label" = "x$redhat_label" ]; then
    12861286                            actual_dev=$try_dev
     
    12951295                Die "Your system uses a LABEL partition ($current_partition), but you lack the tool to support it.\nPlease replace labels with their correct devices in /etc/fstab or install findfs|blkid|vol_id"
    12961296            fi
    1297         else
    1298             str_to_find_fmt_with=$current_partition
    1299         fi
    1300 
    13011297        # This part tries to retrieve the correct device from a UUID line in /etc/fstab
    13021298        # current_partition contains only first column of /etc/fstab
    1303         if [ "`echo "$current_partition" | /bin/grep -i "UUID="`" != "" ]; then
     1299        elif [ "`echo "$current_partition" | /bin/grep -i "UUID="`" != "" ]; then
    13041300            str_to_find_fmt_with=$current_partition
    13051301            uuid=`echo "$current_partition" | cut -d'=' -f2`
Note: See TracChangeset for help on using the changeset viewer.