Changeset 3364


Ignore:
Timestamp:
Mar 15, 2015, 3:02:52 AM (5 years ago)
Author:
Bruno Cornec
Message:
  • Fix a bad sed call using | as separators (perlism)
  • Handle dev/cciss device type in parted2fidsk
Location:
branches/3.2/mindi
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi/mindi

    r3358 r3364  
    250250        fi
    251251    else
    252         echo -en "`basename $mappath | tr '.' '#' | sed s/#kmap#gz// | sed s/#inc#gz//` " | tr '#' '.'
     252        echo -en "`basename $mappath | tr '.' '#' | sed 's/#kmap#gz//' | sed 's/#inc#gz//'` " | tr '#' '.'
    253253    fi
    254254
     
    15961596    # Some distro have a dmsetup conf at that point so removing it Cf: http://trac.mondorescue.org/ticket/651
    15971597    if [ "`which dmsetup`" != "" ]; then
    1598         block_id="`echo $USBPART | sed 's|/dev/||g'`"
     1598        block_id="`echo $USBPART | sed 's/\/dev\///g'`"
    15991599        if [[ "`dmsetup ls | awk '{print $1}' | grep $block_id`" != "" ]]; then
    16001600            LogFile "INFO: Removing $block_id from device mapper."
  • branches/3.2/mindi/parted2fdisk.pl

    r3355 r3364  
    182182if ($args =~ /-s/) {
    183183    $wpart = $device;
    184     $device =~ s/[0-9]+$//;
     184    # To support dev like cciss/c0d0p1
     185    if ($device =~ /([0-9]+)p[0-9]+$/) {
     186        $device =~ s/([0-9]+)p[0-9]+$/$1/;
     187    } else {
     188        $device =~ s/[0-9]+$//;
     189    }
    185190}
    186191
     
    525530#
    526531# this will return bytes
    527 $un = get_un ($device,$wpart,$verbose);
     532$un = get_un($device,$wpart,$verbose);
    528533
    529534$endmax = get_max($device);
Note: See TracChangeset for help on using the changeset viewer.