Don't require tunctl if no_bridge is set

f0e7f3ca · Leonardo Rochael Almeida · 949dbcd2 · f0e7f3ca
Commit f0e7f3ca authored May 03, 2012 by Leonardo Rochael Almeida
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

slapos/format.py slapos/format.py +4 -2

No files found.
--- a/slapos/format.py
+++ b/slapos/format.py
@@ -1099,10 +1099,12 @@ class Config(object):
    if not self.dry_run:
      if self.alter_user:
        self.checkRequiredBinary(['groupadd', 'useradd', 'usermod'])
+      if not self.no_bridge:
+        self.checkRequiredBinary(['tunctl'])
      if self.alter_network:
-        self.checkRequiredBinary(['ip', 'tunctl'])
+        self.checkRequiredBinary(['ip'])
    # Required, even for dry run
-    if self.alter_network:
+    if self.alter_network and not self.no_bridge:
      self.checkRequiredBinary(['brctl'])

    # Check if root is needed