picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nspawn: mangle slice name

Browse source 
It's user-facing, parsed from the command line and we typically mangle
in these cases, let's do so here too. (In particular as the identical
switch for systemd-run already does it.)
This commit is contained in:
Lennart Poettering 2019-11-01 11:21:05 +01:00 committed by Yu Watanabe
parent df957acc66
commit 43c3fb4680
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/nspawn/nspawn.c
View file

@ -103,6 +103,7 @@
#include "terminal-util.h"
#include "tmpfile-util.h"
#include "umask-util.h"
#include "unit-name.h"
#include "user-util.h"
#include "util.h"
@ -891,13 +892,17 @@ static int parse_argv(int argc, char *argv[]) {
arg_settings_mask |= SETTING_MACHINE_ID;
break;
case 'S':
r = free_and_strdup(&arg_slice, optarg);
case 'S': {
_cleanup_free_ char *mangled = NULL;
r = unit_name_mangle_with_suffix(optarg, NULL, UNIT_NAME_MANGLE_WARN, ".slice", &mangled);
if (r < 0)
return log_oom();
free_and_replace(arg_slice, mangled);
arg_settings_mask |= SETTING_SLICE;
break;
}
case 'M':
if (isempty(optarg))