summaryrefslogtreecommitdiffstats
path: root/src/tmpfiles
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-08 18:51:17 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-08 18:51:17 +0000
commitf8bdff40eb3060586a7a385e7879f519b9af7d51 (patch)
tree0581c838f37fefddfd6d880aea14159dd9479e93 /src/tmpfiles
parentReleasing progress-linux version 252.22-1~deb12u1progress7u1. (diff)
downloadsystemd-f8bdff40eb3060586a7a385e7879f519b9af7d51.tar.xz
systemd-f8bdff40eb3060586a7a385e7879f519b9af7d51.zip
Merging upstream version 252.23.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/tmpfiles')
-rw-r--r--src/tmpfiles/tmpfiles.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 9c3d994..281284c 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -3809,10 +3809,12 @@ static int parse_argv(int argc, char *argv[]) {
break;
case ARG_REPLACE:
- if (!path_is_absolute(optarg) ||
- !endswith(optarg, ".conf"))
+ if (!path_is_absolute(optarg))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
- "The argument to --replace= must an absolute path to a config file");
+ "The argument to --replace= must be an absolute path.");
+ if (!endswith(optarg, ".conf"))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "The argument to --replace= must have the extension '.conf'.");
arg_replace = optarg;
break;