Changeset 305 in MondoRescue for branches/2.06/mondo/mondo/mondorestore/mondo-rstr-tools.c

Timestamp:

Jan 12, 2006, 5:37:42 PM (18 years ago)

Author:

bcornec

Message:

use df -P everywhere to avoid split lines on df output and some bugs

File:

• branches/2.06/mondo/mondo/mondorestore/mondo-rstr-tools.c (modified) (4 diffs)

branches/2.06/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -469 +469 @@
         strcat(mount_isodir_command, " -o ro ");
         strcat(mount_isodir_command, bkpinfo->isodir);
-        run_program_and_log_output("df -m", FALSE);
+        run_program_and_log_output("df -P -m", FALSE);
         sprintf(tmp,
                 "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?",
@@ -653 +653 @@
     }
     close_progress_form();
-    run_program_and_log_output("df -m", TRUE);
+    run_program_and_log_output("df -P -m", TRUE);
     if (retval) {
         if (g_partition_table_locked_up > 0) {
@@ -679 +679 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    run_program_and_log_output("df -m", 3);
+    run_program_and_log_output("df -P -m", 3);
     paranoid_free(mountlist);
     paranoid_free(tmp);
@@ -2239 +2239 @@
     sort_mountlist_by_mountpoint(mountlist, 0);
 
-    run_program_and_log_output("df -m", 3);
+    run_program_and_log_output("df -P -m", 3);
     mvaddstr_and_log_it(g_currentY, 0, "Unmounting devices      ");
     open_progress_form("Unmounting devices",