Changeset 729 in MondoRescue for trunk/mondo/mondo/mondorestore

Timestamp:

Jul 30, 2006, 4:06:39 PM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r686:728 $SVN_M/branches/stable

Location:

trunk/mondo/mondo/mondorestore

Files:

• mondo-prep.c (modified) (1 diff)
• mondo-rstr-newt.c (modified) (1 diff)
• mondo-rstr-tools.c (modified) (6 diffs)

trunk/mondo/mondo/mondorestore/mondo-prep.c

@@ -234 +234 @@
     asprintf(&command,
             "for i in `%s | grep -i lvm | cut -d'\"' -f2` ; do %s -a n $i ; %s $i; echo \"Shutting down vg $i\" >> "
-            MONDO_LOGFILE "; done; %s -a n", vgscan_sz, vgchange_sz, vgremove_sz, vgremove_sz);
+            MONDO_LOGFILE "; done", vgscan_sz, vgchange_sz, vgremove_sz);
     paranoid_free(vgchange_sz);
     paranoid_free(vgremove_sz);

trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c

@@ -1352 +1352 @@
     paranoid_free(format_str);
 
-    if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)
-        || !strcmp(mountlist->el[currline].mountpoint, "image")) {
-        mountlist->el[currline].size =
-            calculate_raid_device_size(mountlist, raidlist,
+    if (strcmp(mountlist->el[currline].mountpoint, "image")) {
+        if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)) {
+            mountlist->el[currline].size =
+                calculate_raid_device_size(mountlist, raidlist,
                                        mountlist->el[currline].device);
-    } else {
-        mountlist->el[currline].size = atol(size_str) * 1024;
+        } else {
+            mountlist->el[currline].size = atol(size_str) * 1024;
+        }
     }
     paranoid_free(size_str);

trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -320 +320 @@
             asprintf(&mount_isodir_command, "mount %s -o ro %s", g_isodir_device, bkpinfo->isodir);
         }
-        run_program_and_log_output("df -P -m", FALSE);
+        run_program_and_log_output("df -m", FALSE);
         asprintf(&tmp,
                 "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?",
@@ -445 +445 @@
     }
     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) {
@@ -476 +476 @@
         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);
     return (retval);
@@ -766 +766 @@
                                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",
@@ -1971 +1971 @@
     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"),
@@ -2400 +2400 @@
                 paranoid_free(screen_message);
 
-                if (raidlist->el[i].progress == -1) // delayed while another partition inits
-                {
+                if (raidlist->el[i].progress == -1) { // delayed while another partition inits
                     continue;
                 }