Changeset 3601 in MondoRescue for branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Jul 25, 2016, 4:35:21 PM (8 years ago)

Author:

Bruno Cornec

Message:

Fix #804 by adding logging for /boot content

File:

• branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (1 diff)

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

@@ -588 +588 @@
 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 -al " 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("touch " MNT_RESTORING "/var/log/pacct", 0);
+run_program_and_log_output("touch " MNT_RESTORING "/var/account/pacct", 0);
+
+/* Log the status of the boot area */
+run_program_and_log_output("ls -alR " MNT_RESTORING "/boot", 0);
+
+if (run_program_and_log_output("ls -al " MNT_RESTORING " /tmp", 0)) {
+    run_program_and_log_output("chmod 1777 " MNT_RESTORING "/tmp", 0);
+}
+run_program_and_log_output("mkdir -p " MNT_RESTORING "/var/run/console", 0);
+run_program_and_log_output("chmod 777 " MNT_RESTORING "/dev/null", 0);
+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", 1);
+run_program_and_log_output("rm -f " MNT_RESTORING "/var/run/*.pid", 1);
+run_program_and_log_output("rm -f " MNT_RESTORING "/var/lock/subsys/*", 1);
 }