From: lishengyu <lishengyu@uniontech.com>
Date: Thu, 30 Dec 2021 12:07:34 +0000 (+0800)
Subject: fdisk: when use fdisk -l, open device in nonblock mode
X-Git-Tag: v2.38-rc1~82^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74c9dbae073d328f0358628be0dfd2e2f63eaa2b;p=thirdparty%2Futil-linux.git

fdisk: when use fdisk -l, open device in nonblock mode

When autoclose is set (kernel default) opening a CD-rom
device causes the tray to close.

Signed-off-by: lishengyu <lishengyu@uniontech.com>
---

diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c
index af2afed3e3..2bd2ef41bc 100644
--- a/disk-utils/fdisk.c
+++ b/disk-utils/fdisk.c
@@ -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);