Changeset 729 in MondoRescue for trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c

Timestamp:

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

Author:

Bruno Cornec

Message:

merge -r686:728 $SVN_M/branches/stable

File:

• trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c (modified) (1 diff)

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);