| Index: server/site_linux_router.py
|
| diff --git a/server/site_linux_router.py b/server/site_linux_router.py
|
| index fc2d26dd511e35f77b5ca00f96eba6a09bc97ead..39c39a19424663f7788b0034432a3a6884e80383 100644
|
| --- a/server/site_linux_router.py
|
| +++ b/server/site_linux_router.py
|
| @@ -311,12 +311,11 @@ class LinuxRouter(object):
|
| self.router.run("pkill hostapd >/dev/null 2>&1", ignore_status=True)
|
| # self.router.run("rm -f %s" % self.hostapd['file'])
|
|
|
| - # Tear down the bridge.
|
| - self.router.run("%s link set %s down" % (self.cmd_ip, self.bridgeif),
|
| - ignore_status=True)
|
| -
|
| # Try a couple times to remove the bridge; hostapd may still be exiting
|
| for attempt in range(3):
|
| + self.router.run("%s link set %s down" %
|
| + (self.cmd_ip, self.bridgeif), ignore_status=True)
|
| +
|
| result = self.router.run("%s delbr %s" %
|
| (self.cmd_brctl, self.bridgeif),
|
| ignore_status=True)
|
|
|