Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/util-linux/fdisk_sun.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/util-linux/fdisk_sun.c (modified) (2 diffs)

branches/3.3/mindi-busybox/util-linux/fdisk_sun.c

@@ -349 +349 @@
     set_all_unchanged();
     set_changed(0);
+    check_sun_label();
     get_boot(CREATE_EMPTY_SUN);
 }
@@ -498 +499 @@
             first = read_int(scround(start), scround(stop)+1,
                      scround(stop), 0, mesg);
-        if (display_in_cyl_units)
+        if (display_in_cyl_units) {
             first *= units_per_sector;
-        else
+        } else {
             /* Starting sector has to be properly aligned */
-            first = (first + g_heads * g_sectors - 1) / (g_heads * g_sectors);
+            first = (first + g_heads * g_sectors - 1) /
+                (g_heads * g_sectors);
+            first *= g_heads * g_sectors;
+        }
         if (n == 2 && first != 0)
             printf("\