Changeset 3377 in MondoRescue for branches/3.2/mondo/src/restore-scripts/mondo

Timestamp:

May 6, 2015, 1:10:17 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Rename mr_parted2fdisk to mr-parted2fdisk for consistency with all other new mr-* commands
• Adds functions mr_center_string and mr_popup_and_get_string with dynamic allocation to solve a memory allocation issue reported on the ML
• Fix mr_boot_type to detect correctly a UEFI based system

Location:

branches/3.2/mondo/src/restore-scripts/mondo

Files:

• format-and-kludge-vfat (modified) (1 diff)
• grub-MR (modified) (1 diff)
• make-me-bootable (modified) (2 diffs)

branches/3.2/mondo/src/restore-scripts/mondo/format-and-kludge-vfat

@@ -28 +28 @@
     device=$1
     drive=$2
-    ftype=`mr_parted2fdisk -l $drive 2>/dev/null | grep $device | tr '*' ' ' | tr -s '\t' ' ' | cut -d' ' -f5`
+    ftype=`mr-parted2fdisk -l $drive 2>/dev/null | grep $device | tr '*' ' ' | tr -s '\t' ' ' | cut -d' ' -f5`
     case $ftype in
 #   "b" | "c")

branches/3.2/mondo/src/restore-scripts/mondo/grub-MR

@@ -169 +169 @@
     line=`grep $base /proc/mdstat | head -n1`
     echo "mbrdev was $mbrdev" 2>&1 | tee -a $LOGFILE
-    mbrdev=`mr_parted2fdisk -l 2>/dev/null | grep /dev/ | head -n1 | tr ':' ' ' | cut -d' ' -f2`
+    mbrdev=`mr-parted2fdisk -l 2>/dev/null | grep /dev/ | head -n1 | tr ':' ' ' | cut -d' ' -f2`
     echo "mbrdev is $mbrdev" 2>&1 | tee -a $LOGFILE
     partno="0"; # cheating - FIXME    

branches/3.2/mondo/src/restore-scripts/mondo/make-me-bootable

@@ -17 +17 @@
 dummy="$3"
 
-activepart=`mr_parted2fdisk -l $drivetouse 2>/dev/null | tr -s '\t' ' ' | grep "$drivetouse" | grep '*' | cut -d' ' -f1`
+activepart=`mr-parted2fdisk -l $drivetouse 2>/dev/null | tr -s '\t' ' ' | grep "$drivetouse" | grep '*' | cut -d' ' -f1`
 
 for i in `cat $1 | tr -s '\t' ' ' | cut -d' ' -f1 | grep -vE "/dev/fd|none|#"` ; do
@@ -66 +66 @@
         echo "Would activate $partno on $drive" >> $LOGFILE
     else
-        echo -en "${cmd}a\n$partno\np\nw\n" | mr_parted2fdisk $drive >> $LOGFILE 2>> $LOGFILE
+        echo -en "${cmd}a\n$partno\np\nw\n" | mr-parted2fdisk $drive >> $LOGFILE 2>> $LOGFILE
     fi
 fi