From: Thomas Weißschuh <thomas@t-8ch.de>
Date: Wed, 11 Jan 2023 18:14:03 +0000 (+0000)
Subject: eject: also use sysfs_blkdev_is_removable
X-Git-Tag: v2.39-rc1~119
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2486a0b0c175279a200d9242ba338a9105f965a;p=thirdparty%2Futil-linux.git

eject: also use sysfs_blkdev_is_removable

It correctly represents devices that can be ejected.
---

diff --git a/sys-utils/eject.c b/sys-utils/eject.c
index 717d9fe5b8..6037ddc8f8 100644
--- a/sys-utils/eject.c
+++ b/sys-utils/eject.c
@@ -807,7 +807,7 @@ done:
 	return count;
 }
 
-static int is_hotpluggable(const struct eject_control *ctl)
+static int is_ejectable(const struct eject_control *ctl)
 {
 	struct path_cxt *pc = NULL;
 	dev_t devno;
@@ -819,7 +819,7 @@ static int is_hotpluggable(const struct eject_control *ctl)
 	if (!pc)
 		return 0;
 
-	rc = sysfs_blkdev_is_hotpluggable(pc);
+	rc = sysfs_blkdev_is_hotpluggable(pc) || sysfs_blkdev_is_removable(pc);
 	ul_unref_path(pc);
 	return rc;
 }
@@ -911,8 +911,8 @@ int main(int argc, char **argv)
 		verbose(&ctl, _("%s: is whole-disk device"), ctl.device);
 	}
 
-	if (ctl.F_option == 0 && is_hotpluggable(&ctl) == 0)
-		errx(EXIT_FAILURE, _("%s: is not hot-pluggable device"), ctl.device);
+	if (ctl.F_option == 0 && is_ejectable(&ctl) == 0)
+		errx(EXIT_FAILURE, _("%s: is not ejectable device"), ctl.device);
 
 	/* handle -n option */
 	if (ctl.n_option) {