]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
fdisk: when use fdisk -l, open device in nonblock mode
authorlishengyu <lishengyu@uniontech.com>
Thu, 30 Dec 2021 12:07:34 +0000 (20:07 +0800)
committerlishengyu <lishengyu@uniontech.com>
Thu, 30 Dec 2021 12:14:59 +0000 (20:14 +0800)
When autoclose is set (kernel default) opening a CD-rom
device causes the tray to close.

Signed-off-by: lishengyu <lishengyu@uniontech.com>
disk-utils/fdisk.c

index af2afed3e32cbd293722cb985dc9e338ab3ef56a..2bd2ef41bcd2cc75e6826abe8b11faf91a7079c2 100644 (file)
@@ -806,7 +806,7 @@ static fdisk_sector_t get_dev_blocks(char *dev)
        int fd, ret;
        fdisk_sector_t size;
 
-       if ((fd = open(dev, O_RDONLY)) < 0)
+       if ((fd = open(dev, O_RDONLY|O_NONBLOCK)) < 0)
                err(EXIT_FAILURE, _("cannot open %s"), dev);
        ret = blkdev_get_sectors(fd, (unsigned long long *) &size);
        close(fd);