Changeset 3371 in MondoRescue for branches/3.2/mondo

Timestamp:

Apr 18, 2015, 7:15:32 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Rename mindi/parted2fdisk.pl into mindi/mr_parted2fdisk and make all adaptations required

Location:

branches/3.2/mondo/src

Files:

• common/libmondo-devices.c (modified) (8 diffs)
• common/libmondo-tools.c (modified) (1 diff)
• mondorestore/mondo-prep.c (modified) (3 diffs)
• restore-scripts/mondo/format-and-kludge-vfat (modified) (1 diff)
• restore-scripts/mondo/grub-MR (modified) (1 diff)
• restore-scripts/mondo/make-me-bootable (modified) (2 diffs)

branches/3.2/mondo/src/common/libmondo-devices.c

@@ -324 +324 @@
 #if __FreeBSD__
     return
-        !system
-        ("for drive in /dev/ad? /dev/da?; do fdisk $drive | grep -q FreeBSD && exit 0; done; false");
+        !system("for drive in /dev/ad? /dev/da?; do fdisk $drive | grep -q FreeBSD && exit 0; done; false");
 #else
     return
-        !system
-        ("parted2fdisk -l 2>/dev/null | grep '^/dev/' | grep -Eqv '(MS|DOS|FAT|NTFS)'");
+        !system("mr_parted2fdisk -l 2>/dev/null | grep '^/dev/' | grep -Eqv '(MS|DOS|EFI|FAT|NTFS)'");
 #endif
 }
@@ -366 +364 @@
 #endif
 
-    mr_asprintf(program, "parted2fdisk -l %s 2> /dev/null", drive);
+    mr_asprintf(program, "mr_parted2fdisk -l %s 2> /dev/null", drive);
     fin = popen(program, "r");
     if (!fin) {
@@ -1731 +1729 @@
     * Either way, it's an error.
     ********/
-    mr_asprintf(command, "parted2fdisk -l %s 2>/dev/null|grep -E \"^/dev/\"|awk '{printf(\"%%s \", $1)}END{print \"\"}'", dsf);
+    mr_asprintf(command, "mr_parted2fdisk -l %s 2>/dev/null|grep -E \"^/dev/\"|awk '{printf(\"%%s \", $1)}END{print \"\"}'", dsf);
     log_msg(5, "Executing: %s", command);
     mr_asprintf(partition_list, "%s", call_program_and_get_last_line_of_output(command));
@@ -1797 +1795 @@
         log_msg(4, "Processing partition: %s", partitions[i]);
         /* See if it's swap. If it is, ignore it. */
-        mr_asprintf(command, "parted2fdisk -l %s 2>/dev/null | awk '{if(($1==\"%s\")&&(toupper($0) ~ \"SWAP\")){print $1;exit}}'", ndsf, partitions[i]);
+        mr_asprintf(command, "mr_parted2fdisk -l %s 2>/dev/null | awk '{if(($1==\"%s\")&&(toupper($0) ~ \"SWAP\")){print $1;exit}}'", ndsf, partitions[i]);
         log_msg(5, "  Running: %s", command);
         mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
@@ -2663 +2661 @@
         mr_free(tmp);
 // NTFS 
-        strcpy(tmp1, call_program_and_get_last_line_of_output("parted2fdisk -l 2>/dev/null | grep -i ntfs | awk '{ print $1};' | tr -s '\\n' ' ' | awk '{ print $0};'"));
+        strcpy(tmp1, call_program_and_get_last_line_of_output("mr_parted2fdisk -l 2>/dev/null | grep -i ntfs | awk '{ print $1};' | tr -s '\\n' ' ' | awk '{ print $0};'"));
         if (strlen(tmp1) > 2) {
             if (!popup_and_get_string("NTFS partitions", "Please enter/confirm the NTFS partitions you wish to backup as well.", tmp1, MAX_STR_LEN / 4)) {
@@ -3081 +3079 @@
     assert(which_device != NULL);
 
-    mr_asprintf(list_drives_cmd, "parted2fdisk -l 2>/dev/null | grep \"/dev/.*:\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/; echo %s", where_is_root_mounted());
+    mr_asprintf(list_drives_cmd, "mr_parted2fdisk -l 2>/dev/null | grep \"/dev/.*:\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/; echo %s", where_is_root_mounted());
     log_it("list_drives_cmd = %s", list_drives_cmd);
 
@@ -3123 +3121 @@
     } else {
         // We need to look on each partition then
-        mr_asprintf(list_drives_cmd, "parted2fdisk -l 2>/dev/null | grep -E \"^/dev/\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/");
+        mr_asprintf(list_drives_cmd, "mr_parted2fdisk -l 2>/dev/null | grep -E \"^/dev/\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/");
         log_it("list_drives_cmd = %s", list_drives_cmd);
 
@@ -3271 +3269 @@
     struct stat buf;
 #endif
-    mr_asprintf(command, "parted2fdisk -l %s 2>/dev/null | grep 'EFI GPT'", drive);
+    mr_asprintf(command, "mr_parted2fdisk -l %s 2>/dev/null | grep 'EFI GPT'", drive);
     mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);

branches/3.2/mondo/src/common/libmondo-tools.c

@@ -992 +992 @@
     mr_free(tmp);
 
-    if (!run_program_and_log_output("parted2fdisk -l 2>/dev/null | grep -i raid", 1) && !does_file_exist("/etc/raidtab")) {
+    if (!run_program_and_log_output("mr_parted2fdisk -l 2>/dev/null | grep -i raid", 1) && !does_file_exist("/etc/raidtab")) {
         log_to_screen("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat");
         create_raidtab_from_mdstat(MDSTAT_FILE,"/etc/raidtab");

branches/3.2/mondo/src/mondorestore/mondo-prep.c

@@ -1347 +1347 @@
 #else
 make_hole_for_file(FDISK_LOG);
-mr_asprintf(tmp, "parted2fdisk %s >> %s 2>> %s", drivename, FDISK_LOG, FDISK_LOG);
+mr_asprintf(tmp, "mr_parted2fdisk %s >> %s 2>> %s", drivename, FDISK_LOG, FDISK_LOG);
 pout_to_fdisk = popen(tmp, "w");
 if (!pout_to_fdisk) {
-    log_to_screen("Cannot call parted2fdisk to configure %s", drivename);
+    log_to_screen("Cannot call mr_parted2fdisk to configure %s", drivename);
     mr_free(tmp);
     return (1);
@@ -1587 +1587 @@
 
 
-mr_asprintf(program, "parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
+mr_asprintf(program, "mr_parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
 
 /* BERLIOS: should not be called each time */
@@ -1906 +1906 @@
     } else {
         mr_asprintf(output, "t\n%d\n%s\nw\n", partno, partcode);
-        mr_asprintf(command, "parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
+        mr_asprintf(command, "mr_parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
         log_msg(5, "output = '%s'", output);
         log_msg(5, "partno=%d; partcode=%s", partno, partcode);

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

@@ -28 +28 @@
     device=$1
     drive=$2
-    ftype=`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=`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=`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" | parted2fdisk $drive >> $LOGFILE 2>> $LOGFILE
+        echo -en "${cmd}a\n$partno\np\nw\n" | mr_parted2fdisk $drive >> $LOGFILE 2>> $LOGFILE
     fi
 fi