summaryrefslogtreecommitdiffstats
path: root/todo.py
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2001-01-15 23:00:38 +0000
committerBill Nottingham <notting@redhat.com>2001-01-15 23:00:38 +0000
commit01add110c290a5279908658f17619414eca224cf (patch)
tree6f8fc77509d88b05e3b1d1bd836c56d4dec47861 /todo.py
parent63ade85e83494a6da187674ae8a47c9ff24c25ba (diff)
downloadanaconda-01add110c290a5279908658f17619414eca224cf.tar.gz
anaconda-01add110c290a5279908658f17619414eca224cf.tar.xz
anaconda-01add110c290a5279908658f17619414eca224cf.zip
rework arguments passed to lokkit
Diffstat (limited to 'todo.py')
-rw-r--r--todo.py17
1 files changed, 10 insertions, 7 deletions
diff --git a/todo.py b/todo.py
index 27e3fd331..776c4bfdd 100644
--- a/todo.py
+++ b/todo.py
@@ -735,8 +735,11 @@ class ToDo:
alreadyCrypted = 1)
def setupFirewall (self):
- args = [ "/usr/sbin/lokkit", "--kickstart", "--nostart",
- "--policy", self.firewall.policy ]
+ args = [ "/usr/sbin/lokkit", "--kickstart", "--nostart" ]
+ if self.policy:
+ args.append ("--medium")
+ else:
+ args.append ("--high")
if self.firewall.dhcp:
args.append ("--dhcp")
if self.firewall.portlist:
@@ -749,15 +752,15 @@ class ToDo:
for port in self.firewall.ports:
args.append ("--port", port)
if self.firewall.smtp:
- args.append ("--smtp")
+ args.append ("--port","smtp:tcp")
if self.firewall.http:
- args.append ("--http")
+ args.append ("--port","http:tcp")
if self.firewall.ftp:
- args.append ("--ftp")
+ args.append ("--port","ftp:tcp")
if self.firewall.ssh:
- args.append ("--ssh")
+ args.append ("--port","ssh:tcp")
if self.firewall.telnet:
- args.append ("--telnet")
+ args.append ("--port","telnet:tcp")
for dev in self.firewall.trustdevs:
args.append ("--trust", dev)
if self.firewall.enabled > 0: