gaschz/qubes-network-server
1
0
Fork 0
mirror of https://github.com/Rudd-O/qubes-network-server.git synced 2025-06-06 18:08:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not run spurious commands that are empty.

Browse Source
This commit is contained in:
Manuel Amador (Rudd-O) 2016-10-11 22:42:20 +00:00
parent 7cdbfb43b6
commit 8f66a0c5c1
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/usr/lib64/python2.7/site-packages/qubes/modules/001FortressQubesVm.py
View File

@ -281,12 +281,11 @@ class QubesVm(OriginalQubesVm):
def _add(self, ip, dev, netmask, typ): def _add(self, ip, dev, netmask, typ):
netmask = sum([bin(int(x)).count('1') for x in netmask.split('.')]) netmask = sum([bin(int(x)).count('1') for x in netmask.split('.')])
dev = dev.replace("+", "0") dev = dev.replace("+", "0")
text = self.addrule text = ""
if typ == "forward": if typ == "forward":
text += "addfwrules %s/%s\n" % (pipes.quote(ip), netmask) text += "addfwrules %s/%s\n" % (pipes.quote(ip), netmask)
elif typ == "postrouting": elif typ == "postrouting":
text += "addprrules %s/%s %s\n" % (pipes.quote(ip), netmask, pipes.quote(dev)) text += "addprrules %s/%s %s\n" % (pipes.quote(ip), netmask, pipes.quote(dev))
self.addrule = ""
if not self.rules: if not self.rules:
self.rules = [] self.rules = []
self.rules.append(text) self.rules.append(text)
@ -299,8 +298,8 @@ class QubesVm(OriginalQubesVm):
def commit(self): def commit(self):
if not self.rules: if not self.rules:
return self.addrule + "\ncommitrules\n" return ""
return "\n".join(self.rules) + "\ncommitrules\n" return self.addrule + "\n".join(self.rules) + "\ncommitrules\n"
programs = [] programs = []
staticipvms = [] staticipvms = []