summaryrefslogtreecommitdiffstats
path: root/fdisk/fdisk.c
diff options
context:
space:
mode:
authorFrancesco Cosoleto2011-12-22 15:53:25 +0100
committerKarel Zak2012-01-04 11:35:26 +0100
commit0c48d37192c5a851df9667c3faf75b644c509e98 (patch)
treec95e195a0c52ba95b4c9dd4680486c2a18220f0b /fdisk/fdisk.c
parentlibmount: fix typo in function name (diff)
downloadkernel-qcow2-util-linux-0c48d37192c5a851df9667c3faf75b644c509e98.tar.gz
kernel-qcow2-util-linux-0c48d37192c5a851df9667c3faf75b644c509e98.tar.xz
kernel-qcow2-util-linux-0c48d37192c5a851df9667c3faf75b644c509e98.zip
fdisk: fix incorrect position of is_ide_cdrom_or_tape() call
Reported-by: Guillem Jover <guillem@hadrons.org> Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
Diffstat (limited to 'fdisk/fdisk.c')
-rw-r--r--fdisk/fdisk.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index d967d2733..8c143c313 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -2827,7 +2827,8 @@ print_all_partition_table_from_option(void)
if (is_whole_disk(devname)) {
char *cn = canonicalize_path(devname);
if (cn) {
- print_partition_table_from_option(cn);
+ if (!is_ide_cdrom_or_tape(cn))
+ print_partition_table_from_option(cn);
free(cn);
}
}
@@ -3036,8 +3037,7 @@ main(int argc, char **argv) {
dummy(&k);
listing = 1;
for (k = optind; k < argc; k++)
- if (!is_ide_cdrom_or_tape(argv[k]))
- print_partition_table_from_option(argv[k]);
+ print_partition_table_from_option(argv[k]);
} else
print_all_partition_table_from_option();
exit(0);