Changeset 3301 in MondoRescue for branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.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/mondo-rstr-tools.c (modified) (3 diffs)

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