From: Yu Watanabe Date: Thu, 30 Nov 2017 16:27:53 +0000 (+0900) Subject: mount: do not require that the specified directory exists X-Git-Tag: v236~70^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f4938c2ea523336b11572af6111acd07107fa3dd;p=thirdparty%2Fsystemd.git mount: do not require that the specified directory exists If the specified direcotry does not exist, then systemd creates it when the mount unit starts. So, it is not necessary to check the existence in the client tool. --- diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c index f9ac20be5b8..b454c455184 100644 --- a/src/mount/mount-tool.c +++ b/src/mount/mount-tool.c @@ -30,6 +30,7 @@ #include "escape.h" #include "fd-util.h" #include "fileio.h" +#include "fs-util.h" #include "fstab-util.h" #include "mount-util.h" #include "pager.h" @@ -361,16 +362,9 @@ static int parse_argv(int argc, char *argv[]) { if (argc > optind+1) { if (arg_transport == BUS_TRANSPORT_LOCAL) { - _cleanup_free_ char *p = NULL; - - r = path_make_absolute_cwd(argv[optind+1], &p); + r = chase_symlinks(argv[optind+1], NULL, CHASE_NONEXISTENT, &arg_mount_where); if (r < 0) return log_error_errno(r, "Failed to make path %s absolute: %m", argv[optind+1]); - - arg_mount_where = canonicalize_file_name(p); - if (!arg_mount_where) - return log_error_errno(errno, "Failed to canonicalize path %s: %m", p); - } else { arg_mount_where = strdup(argv[optind+1]); if (!arg_mount_where)