Changeset 609 for branches


Ignore:
Timestamp:
Jun 2, 2006, 9:36:28 PM (13 years ago)
Author:
bcornec
Message:

And a last one fixed in shell syntax of mindi for labelled swaps

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/mindi

    r608 r609  
    13421342        # This part tries to retrieve the correct device from a LABEL line in /etc/fstab
    13431343        # current_partition contains only first column of /etc/fstab
    1344         if [ "`echo "$current_partition" | /bin/grep -i "LABEL="`" != "" ] ; then
     1344        if [ "`echo "$current_partition" | /bin/grep -i "LABEL="`" != "" ]; then
    13451345            str_to_find_fmt_with=$current_partition
    13461346            redhat_label=`echo "$current_partition" | /bin/cut -d'=' -f2`
     
    13481348   
    13491349        # 1st try : blkid, the good way
    1350         if [ -x "/sbin/blkid" ] ; then
     1350        if [ -x "/sbin/blkid" ]; then
    13511351            actual_dev=`/sbin/blkid | /bin/grep "$current_partition" | /bin/cut -d':' -f1`
    13521352        fi
    13531353
    13541354        # 2nd try, which works on a standard partition (ext2/3), but not on swap
    1355         if [ "x$actual_dev" = "x" ] ; then
     1355        if [ "x$actual_dev" = "x" ]; then
    13561356            actual_dev=`/bin/mount -l | /bin/grep "\[$redhat_label\]" | /bin/cut -d' ' -f1`
    13571357        fi
    13581358
    13591359        # 3rd try, with vol_id (which works with swap)
    1360         if [ "x$actual_dev" = "x" -a -x "/sbin/vol_id" ] ; then
     1360        if [ "x$actual_dev" = "x" -a -x "/sbin/vol_id" ]; then
    13611361                list_swaps=`cat /proc/swaps | /bin/grep "/dev/" | /bin/awk '{ print $1 }' `
    13621362                for dev_swap in $list_swaps ; do
    13631363                    dev_exists=`/sbin/vol_id $dev_swap | /bin/grep "$redhat_label"`
    1364                     if [ "x$dev_exists" != "x" ] ; then
     1364                    if [ "x$dev_exists" != "x" ]; then
    13651365                        actual_dev=$dev_swap
    13661366                        break;
     
    13701370
    13711371        # 4th try : pre-formated LABEL. Format is : LABEL=SWAP-mydevice. e.g. : LABEL=SWAP-hda5
    1372         if [ "x$actual_dev" = "x" -a  "`echo "$current_partition" | /bin/grep -i "LABEL=SWAP"`" != ""] ; then
     1372        if [ "x$actual_dev" = "x" -a  _"`echo $current_partition | /bin/grep -i 'LABEL=SWAP'`" != _"" ]; then
    13731373                try_dev="`echo "$redhat_label" | /bin/cut -d '-' -f2`"
    13741374                present_dev="`/bin/cat /proc/swaps | /bin/grep -w /dev/$try_dev`"
     
    13791379
    13801380        # Check if one of all those tries has known success
    1381         if [ "x$actual_dev" != "x" ] ; then
     1381        if [ "x$actual_dev" != "x" ]; then
    13821382                current_partition=$actual_dev
    13831383        else
     
    13891389
    13901390    partition_format=`$AWK '$1 == "'"$str_to_find_fmt_with"'" {print $3}' $MY_FSTAB`
    1391     if [ -d "/proc/lvm" ] && [ "`lvdisplay $current_partition 2> /dev/null`" ] ; then
     1391    if [ -d "/proc/lvm" ] && [ "`lvdisplay $current_partition 2> /dev/null`" ]; then
    13921392        partition_size="lvm"
    1393     elif [ -d "/dev/mapper" ] && [ "`lvm lvdisplay $current_partition 2> /dev/null`" ] ; then
     1393    elif [ -d "/dev/mapper" ] && [ "`lvm lvdisplay $current_partition 2> /dev/null`" ]; then
    13941394        partition_size="lvm"
    13951395    else
Note: See TracChangeset for help on using the changeset viewer.