summaryrefslogtreecommitdiffstats
path: root/libfdisk/src/script.c
diff options
context:
space:
mode:
authorKarel Zak2014-10-09 12:09:07 +0200
committerKarel Zak2014-10-09 12:09:07 +0200
commit9b0b9fb1bff7b4ddd6669a2a57fe4561df376f04 (patch)
tree840bd513ed0a63139968d0a271fc778a20e41f28 /libfdisk/src/script.c
parentlibfdisk: add functions to play nasty games with first/last LBA (diff)
downloadkernel-qcow2-util-linux-9b0b9fb1bff7b4ddd6669a2a57fe4561df376f04.tar.gz
kernel-qcow2-util-linux-9b0b9fb1bff7b4ddd6669a2a57fe4561df376f04.tar.xz
kernel-qcow2-util-linux-9b0b9fb1bff7b4ddd6669a2a57fe4561df376f04.zip
libfdisk: follow explicitly specified partition size
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libfdisk/src/script.c')
-rw-r--r--libfdisk/src/script.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libfdisk/src/script.c b/libfdisk/src/script.c
index fc77d9e71..1b0d2898f 100644
--- a/libfdisk/src/script.c
+++ b/libfdisk/src/script.c
@@ -608,8 +608,10 @@ static int parse_script_line(struct fdisk_script *dp, char *s)
p += 5;
rc = next_number(&p, &num, &pow);
if (!rc) {
- if (pow)
+ if (pow) /* specified as <num><suffix> */
num /= dp->cxt->sector_size;
+ else /* specified as number of sectors */
+ fdisk_partition_size_explicit(pa, 1);
fdisk_partition_set_size(pa, num);
fdisk_partition_end_follow_default(pa, 0);
}
@@ -766,8 +768,10 @@ static int parse_commas_line(struct fdisk_script *dp, char *s)
int pow = 0;
rc = next_number(&p, &num, &pow);
if (!rc) {
- if (pow)
+ if (pow) /* specified as <size><suffix> */
num /= dp->cxt->sector_size;
+ else /* specified as number of sectors */
+ fdisk_partition_size_explicit(pa, 1);
fdisk_partition_set_size(pa, num);
}
fdisk_partition_end_follow_default(pa, 0);