[lxc-devel] [lxd/master] Allow the bridge to be brought down even if disabled

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 413 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20160323/e2700968/attachment.bin>
-------------- next part --------------
From fc93aaf75e2e010124bdd162c31e4af62a550fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Wed, 23 Mar 2016 01:05:25 -0400
Subject: [PATCH] Allow the bridge to be brought down even if disabled
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Otherwise we can't stop it after changing the settings.

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd-bridge/lxd-bridge | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lxd-bridge/lxd-bridge b/lxd-bridge/lxd-bridge
index 5bbcef2..7ddb3fc 100755
--- a/lxd-bridge/lxd-bridge
+++ b/lxd-bridge/lxd-bridge
@@ -157,8 +157,6 @@ start() {
 }
 
 stop() {
-    [ "x${USE_LXD_BRIDGE}" = "xtrue" ] || { exit 0; }
-
     [ -f "${varrun}/network_up" ] || [ "${1}" = "force" ] || { echo "lxd-bridge isn't running"; exit 1; }
 
     if [ -d /sys/class/net/${LXD_BRIDGE} ]; then