Changeset 3364 in MondoRescue

Timestamp:

Mar 15, 2015, 3:02:52 AM (9 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:

• mindi (modified) (2 diffs)
• parted2fdisk.pl (modified) (2 diffs)

branches/3.2/mindi/mindi

@@ -250 +250 @@
         fi
     else
-        echo -en "`basename $mappath | tr '.' '#' | sed s/#kmap#gz// | sed s/#inc#gz//` " | tr '#' '.'
+        echo -en "`basename $mappath | tr '.' '#' | sed 's/#kmap#gz//' | sed 's/#inc#gz//'` " | tr '#' '.'
     fi
 
@@ -1596 +1596 @@
     # Some distro have a dmsetup conf at that point so removing it Cf: http://trac.mondorescue.org/ticket/651
     if [ "`which dmsetup`" != "" ]; then
-        block_id="`echo $USBPART | sed 's|/dev/||g'`"
+        block_id="`echo $USBPART | sed 's/\/dev\///g'`"
         if [[ "`dmsetup ls | awk '{print $1}' | grep $block_id`" != "" ]]; then
             LogFile "INFO: Removing $block_id from device mapper."

branches/3.2/mindi/parted2fdisk.pl

@@ -182 +182 @@
 if ($args =~ /-s/) {
     $wpart = $device;
-    $device =~ s/[0-9]+$//;
+    # To support dev like cciss/c0d0p1
+    if ($device =~ /([0-9]+)p[0-9]+$/) {
+        $device =~ s/([0-9]+)p[0-9]+$/$1/;
+    } else {
+        $device =~ s/[0-9]+$//;
+    }
 }
 
@@ -525 +530 @@
 #
 # this will return bytes
-$un = get_un ($device,$wpart,$verbose);
+$un = get_un($device,$wpart,$verbose);
 
 $endmax = get_max($device);