Changeset 691 in MondoRescue for branches/stable/mondo/mondo/mondorestore/mondo-rstr-tools.c

Timestamp:

Jul 21, 2006, 3:49:26 AM (18 years ago)

Author:

bcornec

Message:

Busybox's df doesn't support -P.
Looking for a bug where e2label not called in nuke mode but not found yet, except if it's related to that problem. (seen in the logs)

File:

• branches/stable/mondo/mondo/mondorestore/mondo-rstr-tools.c (modified) (5 diffs)

branches/stable/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 -P -m", FALSE);
+        run_program_and_log_output("df -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 -P -m", TRUE);
+    run_program_and_log_output("df -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 -P -m", 3);
+    run_program_and_log_output("df -m", 3);
     paranoid_free(mountlist);
     paranoid_free(tmp);
@@ -948 +948 @@
                                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",
+                               "; 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",
@@ -2168 +2168 @@
     sort_mountlist_by_mountpoint(mountlist, 0);
 
-    run_program_and_log_output("df -P -m", 3);
+    run_program_and_log_output("df -m", 3);
     mvaddstr_and_log_it(g_currentY, 0, "Unmounting devices      ");
     open_progress_form("Unmounting devices",