Changeset 3544 in MondoRescue for branches/3.2/mondo

Timestamp:

Mar 24, 2016, 8:34:03 PM (8 years ago)

Author:

Bruno Cornec

Message:

i- The cal to unmount_all_devices copies the log file on to the disk, so after all new log info such as labelling are not copied and thus should be considered on the restored system directly.

Location:

branches/3.2/mondo/src/mondorestore

Files:

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

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

@@ -1920 +1920 @@
     sync();
 
+    /* after that what is logged is not copied on disk, typically the result of labelling */
     mr_asprintf(tmp, "cp -f %s " MNT_RESTORING "/var/log", MONDO_LOGFILE);
     if (run_program_and_log_output(tmp, FALSE)) {

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

@@ -2038 +2038 @@
     /*  if (restore_some || restore_all || */
     if (ask_me_yes_or_no("Label/Identify your ext2/ext3/ext4 partitions if necessary?")) {
-        mvaddstr_and_log_it(g_currentY, 0,
-                            "Using tune2fs/tune4fs to identify your ext2,3,4 partitions");
+        mvaddstr_and_log_it(g_currentY, 0, "Using tune2fs/tune4fs to identify your ext2,3,4 partitions");
         if (does_file_exist("/tmp/fstab.new")) {
             mr_asprintf(fstab_fname, "/tmp/fstab.new");
@@ -2189 +2188 @@
     protect_against_braindead_sysadmins();
     retval += unmount_all_devices(mountlist);
+    /*  No log content will be copied on disk after that call */
     mvaddstr_and_log_it(g_currentY, 0, "Using tune2fs/tune4fs to identify your ext2,3,4 partitions");
 
@@ -2195 +2195 @@
     mr_free(tmp1);
     if (res) {
-        log_to_screen("mr-label-partitions-as-necessary returned an error");
+        log_to_screen("mr-label-partitions-as-necessary returned an error\nNote that these erros are NOT in the copy of the log file on disk");
         mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
     } else {