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

Merge pull request #9291 from poettering/nspawn-fixlets 

tiny nspawn fixlets
This commit is contained in:
Lennart Poettering 2018-06-13 19:16:34 +02:00 committed by GitHub
parent f0d97606e9 df1fac6dea
commit 08ebe56b2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nspawn/nspawn-register.c
View File

@ -20,8 +20,7 @@ static int append_machine_properties(
sd_bus_message *m,
CustomMount *mounts,
unsigned n_mounts,
int kill_signal,
char **properties) {
int kill_signal) {
unsigned j;
int r;
@ -186,8 +185,7 @@ int register_machine(
m,
mounts,
n_mounts,
kill_signal,
properties);
kill_signal);
if (r < 0)
return r;
@ -322,8 +320,7 @@ int allocate_scope(
m,
mounts,
n_mounts,
kill_signal,
properties);
kill_signal);
if (r < 0)
return r;

8
src/nspawn/nspawn.c
View File

@ -586,8 +586,7 @@ static int parse_argv(int argc, char *argv[]) {
return -EINVAL;
}
free(arg_network_zone);
arg_network_zone = j;
free_and_replace(arg_network_zone, j);
arg_network_veth = true;
arg_private_network = true;
@ -4591,10 +4590,15 @@ finish:
strv_free(arg_network_ipvlan);
strv_free(arg_network_veth_extra);
strv_free(arg_parameters);
free(arg_network_zone);
free(arg_network_namespace_path);
strv_free(arg_property);
custom_mount_free_all(arg_custom_mounts, arg_n_custom_mounts);
expose_port_free_all(arg_expose_ports);
free(arg_root_hash);
rlimit_free_all(arg_rlimit);
strv_free(arg_syscall_whitelist);
strv_free(arg_syscall_blacklist);
arg_cpuset = cpu_set_mfree(arg_cpuset);
return r < 0 ? EXIT_FAILURE : ret;