summaryrefslogtreecommitdiffstats
path: root/disk-utils/sfdisk.c
diff options
context:
space:
mode:
authorKarel Zak2015-01-19 12:26:37 +0100
committerKarel Zak2015-01-19 12:26:37 +0100
commit8de07279bb856088cc17ceebf0422ebce4e13d29 (patch)
treeacd9f283831bdc4202b7080bd02da2e8b1924e45 /disk-utils/sfdisk.c
parentlibfdisk: make label names case insensitive (diff)
downloadkernel-qcow2-util-linux-8de07279bb856088cc17ceebf0422ebce4e13d29.tar.gz
kernel-qcow2-util-linux-8de07279bb856088cc17ceebf0422ebce4e13d29.tar.xz
kernel-qcow2-util-linux-8de07279bb856088cc17ceebf0422ebce4e13d29.zip
sfdisk: fix --bytes
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'disk-utils/sfdisk.c')
-rw-r--r--disk-utils/sfdisk.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index d609c55a6..86c8b669f 100644
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -1364,7 +1364,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out)
int main(int argc, char *argv[])
{
const char *outarg = NULL;
- int rc = -EINVAL, c, longidx = -1;
+ int rc = -EINVAL, c, longidx = -1, bytes = 0;
struct sfdisk _sf = {
.partno = -1,
.interactive = isatty(STDIN_FILENO) ? 1 : 0,
@@ -1425,8 +1425,6 @@ int main(int argc, char *argv[])
textdomain(PACKAGE);
atexit(close_stdout);
- sfdisk_init(sf);
-
while ((c = getopt_long(argc, argv, "aAbcdfghlLo:O:nN:qsTu:vVX:Y:",
longopts, &longidx)) != -1) {
switch(c) {
@@ -1523,13 +1521,17 @@ int main(int argc, char *argv[])
sf->noreread = 1;
break;
case OPT_BYTES:
- fdisk_set_size_unit(sf->cxt, FDISK_SIZEUNIT_BYTES);
+ bytes = 1;
break;
default:
usage(stderr);
}
}
+ sfdisk_init(sf);
+ if (bytes)
+ fdisk_set_size_unit(sf->cxt, FDISK_SIZEUNIT_BYTES);
+
if (outarg)
init_fields(NULL, outarg, NULL);