thirdparty/util-linux
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

eject: also use sysfs_blkdev_is_removable

Browse source 
It correctly represents devices that can be ejected.
This commit is contained in:
Thomas Weißschuh 2023-01-11 18:14:03 +00:00 • committed by Karel Zak
parent 3d59c7660c
commit a2486a0b0c
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sys-utils/eject.c
View file

@ -807,7 +807,7 @@ done:
return count; 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; struct path_cxt *pc = NULL;
dev_t devno; dev_t devno;
@ -819,7 +819,7 @@ static int is_hotpluggable(const struct eject_control *ctl)
if (!pc) if (!pc)
return 0; return 0;
rc = sysfs_blkdev_is_hotpluggable(pc); rc = sysfs_blkdev_is_hotpluggable(pc) || sysfs_blkdev_is_removable(pc);
ul_unref_path(pc); ul_unref_path(pc);
return rc; return rc;
} }
@ -911,8 +911,8 @@ int main(int argc, char **argv)
verbose(&ctl, _("%s: is whole-disk device"), ctl.device); verbose(&ctl, _("%s: is whole-disk device"), ctl.device);
} }
if (ctl.F_option == 0 && is_hotpluggable(&ctl) == 0) if (ctl.F_option == 0 && is_ejectable(&ctl) == 0)
errx(EXIT_FAILURE, _("%s: is not hot-pluggable device"), ctl.device); errx(EXIT_FAILURE, _("%s: is not ejectable device"), ctl.device);
/* handle -n option */ /* handle -n option */
if (ctl.n_option) { if (ctl.n_option) {