]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mount-tool: Replace fstype_is_{network,api_vfs} with fstype_is_blockdev_backed 16080/head
authorYmrDtnJu <YmrDtnJu@users.noreply.github.com>
Mon, 8 Jun 2020 17:25:18 +0000 (19:25 +0200)
committerYmrDtnJu <YmrDtnJu@users.noreply.github.com>
Mon, 8 Jun 2020 17:36:42 +0000 (19:36 +0200)
Not every filesystem that is not a network filesystem and also not an API VFS
filesystem has a corresponding block device.

src/mount/mount-tool.c

index 469c14271c2201920a5371e6d3daba62558e6724..ea86a6e06a9e5100b8e57a6ed7b1b277b312da65 100644 (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;