Commit 8702eb74 by Bach Dániel

random fixes v2

parent 557ab841
......@@ -231,11 +231,11 @@ def start_networking():
reload_firewall_vlan(data, True)
except:
print 'nemsikerult:('
raise
# raise
def main():
start_networking()
start_firewall()
main()
\ No newline at end of file
main()
......@@ -11,8 +11,10 @@ setuid fw
script
cd /home/fw/fwdriver
. /home/fw/.virtualenvs/fw/bin/postactivate
. /home/fw/.virtualenvs/fw/bin/activate
celeryd -A fw -Q firewall,dhcp --loglevel=info
HOSTNAME=$(hostname -s)
exec celeryd -A fw -Q ${HOSTNAME}.firewall --loglevel=info -c 1
end script
......@@ -96,7 +96,7 @@ class Switch:
name] + interfaces + ['tag=%d' % int(tag)]
else:
params = ['add-port', self.brname, name]
if tag is not None:
if tag is not None and (trunks is None or len(trunks) == 0):
params = params + ['tag=%d' % int(tag)]
if internal:
params = params + ['--', 'set', 'Interface', interfaces[0],
......
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 sign in to comment