Changeset 3600 in MondoRescue

Timestamp:

Jul 25, 2016, 4:06:23 PM (9 years ago)

Author:

Bruno Cornec

Message:

Use option -T for df for more details in logs where appropriate

File:

• branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

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

@@ -345 +345 @@
 
     mr_strcat(mount_isodir_command, " -o ro %s", bkpinfo->isodir);
-    run_program_and_log_output("df -m -P", FALSE);
+    run_program_and_log_output("df -m -P -T", FALSE);
     log_msg(1, "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?", mount_isodir_command);
     if (run_program_and_log_output(mount_isodir_command, FALSE)) {
-        popup_and_OK
-            ("Cannot mount the device where the ISO files are stored.");
+        popup_and_OK("Cannot mount the device where the ISO files are stored.");
         return (1);
     }
     paranoid_free(mount_isodir_command);
-    log_to_screen
-    ("I have mounted the device where the ISO files are stored.");
+    log_to_screen("I have mounted the device where the ISO files are stored.");
 }
 if (!IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -575 +573 @@
     (void)mount_device("/proc","/proc","proc",TRUE);
     (void)mount_device("/sys","/sys","sysfs",TRUE);
-    run_program_and_log_output("df -m -P", 3);
+    run_program_and_log_output("df -m -P -T", 3);
     paranoid_free(mountlist);
     return (retval);
@@ -1908 +1906 @@
     sort_mountlist_by_mountpoint(mountlist, 0);
 
-    run_program_and_log_output("df -m -P", 3);
+    run_program_and_log_output("df -m -P -T", 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);