Restore interfaces to the correct namespace on error

If the container unexpectedly exists we may need to restore physical interfaces back into the main namespace in a tidy way. Signed-off-by: Blair Steven <blair.steven@alliedtelesis.co.nz>

Restore interfaces to the correct namespace on error
36fb1e07 · Blair Steven · Christian Brauner · d2938916 · 36fb1e07
Unverified Commit 36fb1e07 authored Dec 09, 2020 by Blair Steven Committed by Christian Brauner Dec 09, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

start.c src/lxc/start.c +1 -0

No files found.
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -2069,6 +2069,7 @@ out_detach_blockdev:

 out_delete_network:
 	lxc_abort(handler);
+	lxc_restore_phys_nics_to_netns(handler);
 	lxc_delete_network(handler);
 	detach_block_device(handler->conf);
 	lxc_end(handler);