Changeset 2351 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Aug 28, 2009, 2:41:30 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Replacement of some fgets by mr_getline to allow for dyn. memory management.
• Backport of SElinux fix from 2.2.9

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (7 diffs)

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

@@ -298 +298 @@
 
     mr_strcat(mount_isodir_command, " -o ro %s", bkpinfo->isodir);
-    run_program_and_log_output("df -m", FALSE);
-    log_msg(1, 
-        "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?",
-        mount_isodir_command);
+    run_program_and_log_output("df -m -P", 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
@@ -472 +470 @@
  * @return The number of errors encountered (0 for success).
  */
-int mount_all_devices(struct mountlist_itself
-                      *p_external_copy_of_mountlist, bool writeable)
+int mount_all_devices(struct mountlist_itself *p_external_copy_of_mountlist, bool writeable)
 {
 int retval = 0, lino, res;
@@ -488 +485 @@
 
     mvaddstr_and_log_it(g_currentY, 0, "Mounting devices         ");
-    open_progress_form("Mounting devices",
-               "I am now mounting all the drives.",
-               "This should not take long.",
-               "", mountlist->entries);
+    open_progress_form("Mounting devices", "I am now mounting all the drives.", "This should not take long.", "", mountlist->entries);
 
     mr_asprintf(these_failed, "");
     for (lino = 0; lino < mountlist->entries; lino++) {
         if (!strcmp(mountlist->el[lino].device, "/proc")) {
-            log_msg(1,
-                "Again with the /proc - why is this in your mountlist?");
+            log_msg(1, "Again with the /proc - why is this in your mountlist?");
         } else if (is_this_device_mounted(mountlist->el[lino].device)) {
             log_to_screen("%s is already mounted", mountlist->el[lino].device);
@@ -519 +512 @@
     if (retval) {
         if (g_partition_table_locked_up > 0) {
-            log_to_screen
-                ("fdisk's ictol() call to refresh its copy of the partition table causes the kernel to");
-            log_to_screen
-                ("lock up the partition table. You might have to reboot and use Interactive Mode to");
-            log_to_screen
-                ("format and restore *without* partitioning first. Sorry for the inconvenience.");
+            log_to_screen("fdisk's ictol() call to refresh its copy of the partition table causes the kernel to");
+            log_to_screen("lock up the partition table. You might have to reboot and use Interactive Mode to");
+            log_to_screen("format and restore *without* partitioning first. Sorry for the inconvenience.");
         }
         mr_asprintf(tmp, "Could not mount device(s) %s- shall I abort?", these_failed);
@@ -530 +520 @@
         if (!ask_me_yes_or_no(tmp)) {
             retval = 0;
-            log_to_screen
-                ("Continuing, although some device(s) failed to be mounted");
+            log_to_screen("Continuing, although some device(s) failed to be mounted");
             mvaddstr_and_log_it(g_currentY++, 74, "Done.");
         } else {
             mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
-            log_to_screen
-        ("Unable to mount some or all of your partitions.");
+            log_to_screen("Unable to mount some or all of your partitions.");
         }
         mr_free(tmp);
@@ -548 +536 @@
     (void)mount_device("/proc","/proc","proc",TRUE);
     (void)mount_device("/sys","/sys","sysfs",TRUE);
-    run_program_and_log_output("df -m", 3);
+    run_program_and_log_output("df -m -P", 3);
     paranoid_free(mountlist);
     return (retval);
@@ -2036 +2024 @@
     sort_mountlist_by_mountpoint(mountlist, 0);
 
-    run_program_and_log_output("df -m", 3);
+    run_program_and_log_output("df -m -P", 3);
     mvaddstr_and_log_it(g_currentY, 0, "Unmounting devices      ");
     open_progress_form("Unmounting devices",