libparted: raise dos partition limit from 16 to 64

* NEWS (Bug fixes): Mention it.
* libparted/labels/dos.c (MAX_TOTAL_PART): s/16/64/
* tests/t9042-dos-partition-limit.sh: s/13/61/ (MAX_TOTAL_PART-3)
(adjust/factor some of the logic - jmm)

diff --git a/NEWS b/NEWS
index 194903b..7584c56 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ GNU parted NEWS                                    -*- outline -*-
 
 ** New features
 
+  Increased limit for msdos partitions from 16 to 64
+
   parted has improved support for partitionable loopback devices
 
 ** Bug fixes

diff --git a/libparted/labels/dos.c b/libparted/labels/dos.c
index 3f3effe..1d3a867 100644 (file)
--- a/libparted/labels/dos.c
+++ b/libparted/labels/dos.c
@@ -103,7 +103,7 @@ static const char MBR_BOOT_CODE[] = {
  * (i.e. 1022 is sometimes used to indicate "use LBA").
  */
 #define MAX_CHS_CYLINDER       1021
-#define MAX_TOTAL_PART         16
+#define MAX_TOTAL_PART         64
 
 typedef struct _DosRawPartition                DosRawPartition;
 typedef struct _DosRawTable            DosRawTable;

diff --git a/tests/t9042-dos-partition-limit.sh b/tests/t9042-dos-partition-limit.sh
index 07e8f64..fe783c7 100644 (file)
--- a/tests/t9042-dos-partition-limit.sh
+++ b/tests/t9042-dos-partition-limit.sh
@@ -26,7 +26,7 @@ grep '^#define USE_BLKID 1' "$CONFIG_HEADER" > /dev/null ||
 
 ss=$sector_size_
 partition_sectors=256  # sectors per partition
-n_partitions=13        # how many partitions to create
+n_partitions=61        # how many partitions to create
 start=2048             # start sector for the first partition
 
 n_sectors=$(($start + n_partitions * partition_sectors))
@@ -41,11 +41,11 @@ scsi_dev=$(cat dev-name)
 n=$((n_MiB * sectors_per_MiB))
 printf '%s\n' "BYT;" \
     "$scsi_dev:${n}s:scsi:$ss:$ss:msdos:Linux scsi_debug;" \
-    "1:$((start-2))s:$((start-2+4098-1))s:4098s:::lba;" \
+    "1:$((start-2))s:$((n-1))s:$((n-start+2))s:::lba;" \
   > exp || fail=1
 
 parted -s $scsi_dev mklabel msdos || fail=1
-parted -s -a min $scsi_dev mkpart extended 2046s 100% || fail=1
+parted -s -a min $scsi_dev mkpart extended $((start-2))s 100% || fail=1
 
 i=1
 while :; do