shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-11 05:17:44 +03:00
Code

nspawn: make sure --template= and --machine= my be combined

Browse Source 
Fixes #1018.

Based on a patch from Seth Jennings.
This commit is contained in:
Lennart Poettering 2015-08-25 20:26:51 +02:00
parent 33c1c9745c
commit c1521918b4
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/nspawn/nspawn.c
View File

@ -559,9 +559,9 @@ static int parse_argv(int argc, char *argv[]) {
break;
case 'M':
if (isempty(optarg)) {
if (isempty(optarg))
arg_machine = mfree(arg_machine);
} else {
else {
if (!machine_name_is_valid(optarg)) {
log_error("Invalid machine name: %s", optarg);
return -EINVAL;
@ -4002,6 +4002,17 @@ static int on_orderly_shutdown(sd_event_source *s, const struct signalfd_siginfo
static int determine_names(void) {
int r;
if (arg_template && !arg_directory && arg_machine) {
/* If --template= was specified then we should not
* search for a machine, but instead create a new one
* in /var/lib/machine. */
arg_directory = strjoin("/var/lib/machines/", arg_machine, NULL);
if (!arg_directory)
return log_oom();
}
if (!arg_image && !arg_directory) {
if (arg_machine) {
_cleanup_(image_unrefp) Image *i = NULL;