Changeset 3301 in MondoRescue for branches/3.2

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.

Location:

branches/3.2/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (1 diff)
• mondo-rstr-tools.c (modified) (3 diffs)
• mondorestore.c (modified) (6 diffs)

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

@@ -2119 +2119 @@
 char *which_format_command_do_i_need(char *format) {
 
+char *program = NULL;
+
 assert_string_is_neither_NULL_nor_zerolength(format);
 

branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -587 +587 @@
 * up correctly on the first boot.
 */
-void protect_against_braindead_sysadmins()
-{
-run_program_and_log_output("touch " MNT_RESTORING "/var/log/pacct",
-                       FALSE);
-run_program_and_log_output("touch " MNT_RESTORING "/var/account/pacct",
-                       FALSE);
+void protect_against_braindead_sysadmins() {
+
+run_program_and_log_output("touch " MNT_RESTORING "/var/log/pacct", FALSE);
+run_program_and_log_output("touch " MNT_RESTORING "/var/account/pacct", FALSE);
 if (run_program_and_log_output("ls " MNT_RESTORING " /tmp", FALSE)) {
-run_program_and_log_output("chmod 1777 " MNT_RESTORING "/tmp",
-                           FALSE);
-}
-run_program_and_log_output("mkdir -p " MNT_RESTORING
-                       "/var/run/console", FALSE);
-run_program_and_log_output("chmod 777 " MNT_RESTORING "/dev/null",
-                       FALSE);
-run_program_and_log_output("cd " MNT_RESTORING
-                       "; for i in `ls home/`; do echo \"Moving $i's spurious files to $i/.disabled\"; mkdir \"$i\"/.disabled ; mv -f \"$i\"/.DCOP* \"$i\"/.MCOP* \"$i\"/.*authority \"$i\"/.kde/tmp* \"$i\"/.kde/socket* \"$i\"/.disabled/ ; done",
-                       TRUE);
-run_program_and_log_output("rm -f " MNT_RESTORING "/var/run/*.pid",
-                       TRUE);
-run_program_and_log_output("rm -f " MNT_RESTORING "/var/lock/subsys/*",
-                       TRUE);
+    run_program_and_log_output("chmod 1777 " MNT_RESTORING "/tmp", FALSE);
+}
+run_program_and_log_output("mkdir -p " MNT_RESTORING "/var/run/console", FALSE);
+run_program_and_log_output("chmod 777 " MNT_RESTORING "/dev/null", FALSE);
+run_program_and_log_output("cd " MNT_RESTORING "; for i in `ls home/`; do echo \"Moving $i's spurious files to $i/.disabled\"; mkdir \"$i\"/.disabled ; mv -f \"$i\"/.DCOP* \"$i\"/.MCOP* \"$i\"/.*authority \"$i\"/.kde/tmp* \"$i\"/.kde/socket* \"$i\"/.disabled/ ; done", TRUE);
+run_program_and_log_output("rm -f " MNT_RESTORING "/var/run/*.pid", TRUE);
+run_program_and_log_output("rm -f " MNT_RESTORING "/var/lock/subsys/*", TRUE);
 }
 
@@ -1903 +1894 @@
 
     mountlist = malloc(sizeof(struct mountlist_itself));
-    memcpy((void *) mountlist, (void *) p_external_copy_of_mountlist,
-           sizeof(struct mountlist_itself));
+    memcpy((void *) mountlist, (void *) p_external_copy_of_mountlist, sizeof(struct mountlist_itself));
     sort_mountlist_by_mountpoint(mountlist, 0);
 
     run_program_and_log_output("df -m -P", 3);
     mvaddstr_and_log_it(g_currentY, 0, "Unmounting devices      ");
-    open_progress_form("Unmounting devices",
-                       "Unmounting all devices that were mounted,",
-                       "in preparation for the post-restoration reboot.",
-                       "", mountlist->entries);
+    open_progress_form("Unmounting devices", "Unmounting all devices that were mounted,", "in preparation for the post-restoration reboot.", "", mountlist->entries);
     if (chdir("/")) {
         // FIXME
     }
-    for (i = 0;
-         i < 10
-         &&
-         run_program_and_log_output
-         ("ps | grep buffer | grep -v \"grep buffer\"", TRUE) == 0;
-         i++) {
+    for (i = 0; i < 10 && run_program_and_log_output("ps | grep buffer | grep -v \"grep buffer\"", TRUE) == 0; i++) {
         sleep(1);
         log_msg(2, "Waiting for buffer() to finish");
@@ -1930 +1912 @@
     mr_asprintf(tmp, "cp -f %s " MNT_RESTORING "/var/log", MONDO_LOGFILE);
     if (run_program_and_log_output(tmp, FALSE)) {
-        log_msg(1,
-                "Error. Failed to copy log to PC's /var/log dir. (Mounted read-only?)");
+        log_msg(1, "Error. Failed to copy log to PC's /var/log dir. (Mounted read-only?)");
     }
     paranoid_free(tmp);
     if (does_file_exist("/tmp/DUMBASS-GENTOO")) {
-        run_program_and_log_output("mkdir -p " MNT_RESTORING
-                                   "/mnt/.boot.d", 5);
+        run_program_and_log_output("mkdir -p " MNT_RESTORING "/mnt/.boot.d", 5);
     }
 

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);