Changeset 3301 in MondoRescue for branches/3.2/mondo/src/mondorestore/mondorestore.c

Timestamp:

Jun 17, 2014, 9:10:18 PM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix a usage of mountlist.txt still with MINDI_CACHE, incorrect for now.

File:

• branches/3.2/mondo/src/mondorestore/mondorestore.c (modified) (6 diffs)

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

@@ -634 +634 @@
         mr_free(tmp1);
         if (res) {
-            log_to_screen
-                ("label-partitions-as-necessary returned an error");
+            log_to_screen("label-partitions-as-necessary returned an error");
             mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
         } else {
@@ -727 +726 @@
  * @warning <b><i>THIS WILL ERASE ALL EXISTING DATA!</i></b>
  */
-int
-nuke_mode(struct mountlist_itself *mountlist,
-          struct raidlist_itself *raidlist)
+int nuke_mode(struct mountlist_itself *mountlist, struct raidlist_itself *raidlist)
 {
     int retval = 0;
@@ -807 +804 @@
     retval += res;
     if (res) {
-        mvaddstr_and_log_it(g_currentY++,
-                            0,
-                            "Failed to partition and/or format your hard drives.");
+        mvaddstr_and_log_it(g_currentY++, 0, "Failed to partition and/or format your hard drives.");
 
         if (ask_me_yes_or_no("Try in interactive mode instead?")) {
@@ -815 +810 @@
             goto after_the_nuke;
         } else
-            if (!ask_me_yes_or_no
-                ("Would you like to try to proceed anyway?")) {
+            if (!ask_me_yes_or_no("Would you like to try to proceed anyway?")) {
             return (retval);
         }
@@ -823 +817 @@
     if (retval) {
         unmount_all_devices(mountlist);
-        log_to_screen
-            ("Unable to mount all partitions. Sorry, I cannot proceed.");
+        log_to_screen("Unable to mount all partitions. Sorry, I cannot proceed.");
         return (retval);
     }
@@ -831 +824 @@
     clean_multipathconf();
     if (!run_boot_loader(FALSE)) {
-        log_msg(1,
-                "Great! Boot loader was installed. No need for msg at end.");
+        log_msg(1, "Great! Boot loader was installed. No need for msg at end.");
     }
     clean_blkid();
     protect_against_braindead_sysadmins();
     retval += unmount_all_devices(mountlist);
-    mvaddstr_and_log_it(g_currentY,
-                        0,
-                        "Using tune2fs/tune4fs to identify your ext2,3,4 partitions");
-
-    mr_asprintf(tmp1, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", MINDI_CACHE"/mountlist.txt", MONDO_LOGFILE, MONDO_LOGFILE);
+    mvaddstr_and_log_it(g_currentY, 0, "Using tune2fs/tune4fs to identify your ext2,3,4 partitions");
+
+    mr_asprintf(tmp1, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", "/tmp/mountlist.txt", MONDO_LOGFILE, MONDO_LOGFILE);
     res = run_program_and_log_output(tmp1, TRUE);
     mr_free(tmp1);