Changeset 3057 in MondoRescue for branches/3.0/mondo/src/mondorestore/mondo-prep.c

Timestamp:

Nov 2, 2012, 8:28:12 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix #611 by changing make-me-bootable to first desactivate all active partitions on the given disk, and then reactivate only the one needed (change of interface for this script). This remains not very satisfactory, and storing active flags at backup time would probably be better, but would require to handle HW modification cases with this script anyway.

File:

• branches/3.0/mondo/src/mondorestore/mondo-prep.c (modified) (1 diff)

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

@@ -1691 +1691 @@
 
     if (pout_to_fdisk) {
-// mark relevant partition as bootable
-        sprintf(tmp, "a\n%s\n",
-                call_program_and_get_last_line_of_output
-                ("make-me-bootable /tmp/mountlist.txt dummy"));
-        fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
-// close fdisk
+        // close fdisk
         fput_string_one_char_at_a_time(pout_to_fdisk, "p\n");
         fput_string_one_char_at_a_time(pout_to_fdisk, "w\n");
+        paranoid_pclose(pout_to_fdisk);
         system("sync");
-        paranoid_pclose(pout_to_fdisk);
-        log_msg(0,
-                "------------------- fdisk.log looks like this ------------------");
+        log_msg(0,"------------------- fdisk.log looks like this ------------------");
         sprintf(tmp, "cat %s >> %s", FDISK_LOG, MONDO_LOGFILE);
         system(tmp);
-        log_msg(0,
-                "------------------- end of fdisk.log...       ------------------");
+        // mark relevant partition as bootable
+        mr_asprintf(&tmp1,"make-me-bootable /tmp/mountlist.txt %s noaction",drivename);
+        call_program_and_get_last_line_of_output(tmp1);
+        mr_free(tmp1);
+        log_msg(0,"------------------- end of fdisk.log...       ------------------");
+        system("sync");
         sprintf(tmp, "tail -n6 %s | grep -F \"16: \"", FDISK_LOG);
         if (!run_program_and_log_output(tmp, 5)) {