shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-03 13:47:04 +03:00
Code

mount-tool: Replace fstype_is_{network,api_vfs} with fstype_is_blockdev_backed

Browse Source 
Not every filesystem that is not a network filesystem and also not an API VFS
filesystem has a corresponding block device.
This commit is contained in:
YmrDtnJu 2020-06-08 19:25:18 +02:00
parent ac2474e4ff
commit c15ab81ed9
No known key found for this signature in database
GPG Key ID: 1F4A6BFF76BBB4EC
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mount/mount-tool.c
View File

@ -364,7 +364,7 @@ static int parse_argv(int argc, char *argv[]) {
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"At most two arguments required.");
if (arg_mount_type && (fstype_is_api_vfs(arg_mount_type) || fstype_is_network(arg_mount_type))) {
if (arg_mount_type && !fstype_is_blockdev_backed(arg_mount_type)) {
arg_mount_what = strdup(argv[optind]);
if (!arg_mount_what)
return log_oom();
@ -1463,7 +1463,7 @@ static int run(int argc, char* argv[]) {
if (arg_action == ACTION_UMOUNT)
return action_umount(bus, argc, argv);
if ((!arg_mount_type || !fstype_is_network(arg_mount_type))
if ((!arg_mount_type || fstype_is_blockdev_backed(arg_mount_type))
&& !path_is_normalized(arg_mount_what)) {
log_error("Path contains non-normalized components: %s", arg_mount_what);
return -EINVAL;