mirror of
https://github.com/sheumann/hush.git
synced 2024-12-27 16:31:24 +00:00
mountpoint: btrfs fix
Signed-off-by: Vladimir Dronnikov <dronnikov@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
fe4e23f9de
commit
4214f8b537
@ -55,8 +55,17 @@ int mountpoint_main(int argc UNUSED_PARAM, char **argv)
|
|||||||
|
|
||||||
if (opt & OPT_d)
|
if (opt & OPT_d)
|
||||||
printf("%u:%u\n", major(st_dev), minor(st_dev));
|
printf("%u:%u\n", major(st_dev), minor(st_dev));
|
||||||
if (opt & OPT_n)
|
if (opt & OPT_n) {
|
||||||
printf("%s %s\n", find_block_device(arg), arg);
|
const char *d = find_block_device(arg);
|
||||||
|
/* name is undefined, but device is mounted -> anonymous superblock! */
|
||||||
|
/* happens with btrfs */
|
||||||
|
if (!d) {
|
||||||
|
d = "UNKNOWN";
|
||||||
|
/* TODO: iterate /proc/mounts, or /proc/self/mountinfo
|
||||||
|
* to find out the device name */
|
||||||
|
}
|
||||||
|
printf("%s %s\n", d, arg);
|
||||||
|
}
|
||||||
if (!(opt & (OPT_q | OPT_d | OPT_n)))
|
if (!(opt & (OPT_q | OPT_d | OPT_n)))
|
||||||
printf("%s is %sa mountpoint\n", arg, is_not_mnt ? "not " : "");
|
printf("%s is %sa mountpoint\n", arg, is_not_mnt ? "not " : "");
|
||||||
return is_not_mnt;
|
return is_not_mnt;
|
||||||
|
Loading…
Reference in New Issue
Block a user