]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
fdisk: fix incorrect position of is_ide_cdrom_or_tape() call
authorFrancesco Cosoleto <cosoleto@gmail.com>
Thu, 22 Dec 2011 14:53:25 +0000 (15:53 +0100)
committerKarel Zak <kzak@redhat.com>
Wed, 4 Jan 2012 10:35:26 +0000 (11:35 +0100)
Reported-by: Guillem Jover <guillem@hadrons.org>
Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
fdisk/fdisk.c

index d967d27330bad3201a2e7a3d0e027c826ea96b37..8c143c3138f822b5274debbb645e412c17663400 100644 (file)
@@ -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);