[LXC] Cleanup devices on container shutdown

diff --git a/ChangeLog b/ChangeLog
index e13e72e01e7b850c14bca383ab99af0b758e9583..d398f32b22aaa015adf952c8a65b4e7fbf77db88 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Fri Aug 22 08:30:00 PDT 2008 Dan Smith <danms@us.ibm.com>
+       * src/lxc_driver.c: Make sure we cleanup veth devices at shutdown
+
 Fri Aug 22 11:49:42 BST 2008 Daniel P. Berrange <berrange@redhat.com>
 
        * python/libvir.py: Use libvirt error message as exception

diff --git a/src/lxc_driver.c b/src/lxc_driver.c
index 3f67c8a372c0eac4eaf1a0281b2c10094bd5ca32..57622816913b6eabdbc8c5572df3a48425ed5a74 100644 (file)
--- a/src/lxc_driver.c
+++ b/src/lxc_driver.c
@@ -375,6 +375,7 @@ static int lxcVMCleanup(virConnectPtr conn,
     int rc = -1;
     int waitRc;
     int childStatus = -1;
+    virDomainNetDefPtr net;
 
     while (((waitRc = waitpid(vm->pid, &childStatus, 0)) == -1) &&
            errno == EINTR)
@@ -404,6 +405,11 @@ static int lxcVMCleanup(virConnectPtr conn,
     vm->def->id = -1;
     vm->monitor = -1;
 
+    for (net = vm->def->nets; net; net = net->next) {
+        vethInterfaceUpOrDown(net->ifname, 0);
+        vethDelete(net->ifname);
+    }
+
     return rc;
 }