From: Karel Zak <kzak@redhat.com>
Date: Mon, 19 Apr 2021 11:19:23 +0000 (+0200)
Subject: libfdisk: do not reset default if undefined by script
X-Git-Tag: v2.37-rc2~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f17b992e37fc41ff7abfdb6ee94dd03d4431a37;p=thirdparty%2Futil-linux.git

libfdisk: do not reset default if undefined by script

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
index 1a086a61d8..97b161312e 100644
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
@@ -758,7 +758,9 @@ static int count_first_last_lba(struct fdisk_context *cxt,
 	/* Get the table length from the script, if given */
 	if (cxt->script) {
 		rc = get_script_u64(cxt, &nents, "table-length");
-		if (rc < 0)
+		if (rc == 1)
+			nents = GPT_NPARTITIONS;  /* undefined by script */
+		else if (rc < 0)
 			return rc;
 	}