diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2023-05-16 17:26:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-16 17:26:25 +0200 |
| commit | a5a4d5a18e6270b3623dc5c48f1c61344f1d0555 (patch) | |
| tree | 136327df8a5acd02c2692c6ef9c34b9a75c8dade /src/nspawn/nspawn.c | |
| parent | 329f4b06f5124a8db042e8bd42fbc3265744aaa6 (diff) | |
| parent | cd70372b934bded2249f26c72d4b6ab9bdf50a13 (diff) | |
| download | systemd-a5a4d5a18e6270b3623dc5c48f1c61344f1d0555.tar.gz | |
Merge pull request #27651 from mrc0mmand/more-nspawn-tests
nspawn: OCI related fixes & tests
Diffstat (limited to 'src/nspawn/nspawn.c')
| -rw-r--r-- | src/nspawn/nspawn.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 49802d6fdf..5d49e05064 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -4651,6 +4651,7 @@ static int merge_settings(Settings *settings, const char *path) { device_node_array_free(arg_extra_nodes, arg_n_extra_nodes); arg_extra_nodes = TAKE_PTR(settings->extra_nodes); arg_n_extra_nodes = settings->n_extra_nodes; + settings->n_extra_nodes = 0; return 0; } |