Commit 922eff6d authored by Łukasz Nowak's avatar Łukasz Nowak

Avoid creation of tap interfaces during system check.

Running "tunctl" will result in creation of a tap interface. In order to avoid
it call it with some "-d" parameter which will make it exit fast.
parent 411c2f1d
...@@ -1040,8 +1040,10 @@ class Config(object): ...@@ -1040,8 +1040,10 @@ class Config(object):
def checkRequiredBinary(binary_list): def checkRequiredBinary(binary_list):
missing_binary_list = [] missing_binary_list = []
for b in binary_list: for b in binary_list:
if type(b) != type([]):
b = [b]
try: try:
callAndRead([b]) callAndRead(b)
except ValueError: except ValueError:
pass pass
except OSError: except OSError:
...@@ -1126,7 +1128,7 @@ class Config(object): ...@@ -1126,7 +1128,7 @@ class Config(object):
if self.alter_user: if self.alter_user:
self.checkRequiredBinary(['groupadd', 'useradd', 'usermod']) self.checkRequiredBinary(['groupadd', 'useradd', 'usermod'])
if self.create_tap: if self.create_tap:
self.checkRequiredBinary(['tunctl']) self.checkRequiredBinary([['tunctl', '-d']])
if self.alter_network: if self.alter_network:
self.checkRequiredBinary(['ip']) self.checkRequiredBinary(['ip'])
# Required, even for dry run # Required, even for dry run
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment