diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 10:23:36 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 10:23:36 +0000 |
| commit | 3124284ced2903518f6d277b8c8d63ed79da47b7 (patch) | |
| tree | a7e9aca4373a077d060a80c5ff9adbda67822f3f /src/nspawn | |
| parent | Releasing progress-linux version 252.22-1~deb12u1~progress6.99u1. (diff) | |
| download | systemd-3124284ced2903518f6d277b8c8d63ed79da47b7.tar.xz systemd-3124284ced2903518f6d277b8c8d63ed79da47b7.zip | |
Merging upstream version 252.23.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/nspawn')
| -rw-r--r-- | src/nspawn/nspawn.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 6c9f084..68c5b18 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -1805,8 +1805,10 @@ static int verify_arguments(void) { if (arg_ephemeral && arg_template) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "--ephemeral and --template= may not be combined."); - if (arg_ephemeral && !IN_SET(arg_link_journal, LINK_NO, LINK_AUTO)) - return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "--ephemeral and --link-journal= may not be combined."); + /* Permit --ephemeral with --link-journal=try-* to satisfy principle of the least astonishment + * (by common sense, "try" means "do not fail if not possible") */ + if (arg_ephemeral && !IN_SET(arg_link_journal, LINK_NO, LINK_AUTO) && !arg_link_journal_try) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "--ephemeral and --link-journal={host,guest} may not be combined."); if (arg_userns_mode != USER_NAMESPACE_NO && !userns_supported()) return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "--private-users= is not supported, kernel compiled without user namespace support."); |