diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-08-14 02:00:12 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-08-14 02:00:12 +0000 |
| commit | c540e134193f9759873ced09b0156c6219983101 (patch) | |
| tree | b36013fe219e6c3d8762bf2a0a32b538ac5c0373 /kickstart.py | |
| parent | 3f01dfc8e9d6b8bf25b79b1cbda94ca0ff4ada09 (diff) | |
| download | anaconda-c540e134193f9759873ced09b0156c6219983101.tar.gz anaconda-c540e134193f9759873ced09b0156c6219983101.tar.xz anaconda-c540e134193f9759873ced09b0156c6219983101.zip | |
merge from taroon-branch. all kinds of miscellaneous bugfixes, including
* firewall update
* iSeries PReP size
* ppc mediacheck
* tzdata stuff
* cmdline mode
* pkg defaults screen
Diffstat (limited to 'kickstart.py')
| -rw-r--r-- | kickstart.py | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/kickstart.py b/kickstart.py index 24db10203..a95910bde 100644 --- a/kickstart.py +++ b/kickstart.py @@ -96,25 +96,21 @@ class KickstartBase(BaseInstallClass): def doFirewall(self, id, args): (args, extra) = isys.getopt(args, '', - [ 'dhcp', 'ssh', 'telnet', 'smtp', 'http', 'ftp', + [ 'dhcp', 'ssh', 'telnet', 'smtp', 'http', 'ftp', 'enabled', 'port=', 'high', 'medium', 'disabled', 'trust=' ]) - dhcp = 0 ssh = 0 telnet = 0 smtp = 0 http = 0 ftp = 0 - policy = 0 enable = -1 trusts = [] ports = "" for n in args: (str, arg) = n - if str == '--dhcp': - dhcp = 1 - elif str == '--ssh': + if str == '--ssh': ssh = 1 elif str == '--telnet': telnet = 1 @@ -124,11 +120,10 @@ class KickstartBase(BaseInstallClass): http = 1 elif str == '--ftp': ftp = 1 - elif str == '--high': - policy = 0 + elif str == '--high' or str == '--medium': + log("used deprecated firewall option: %s" %(str[2:],)) enable = 1 - elif str == '--medium': - policy = 1 + elif str == '--enabled': enable = 1 elif str == '--disabled': enable = 0 @@ -140,7 +135,7 @@ class KickstartBase(BaseInstallClass): else: ports = arg - self.setFirewall(id, enable, policy, trusts, ports, dhcp, ssh, telnet, + self.setFirewall(id, enable, trusts, ports, ssh, telnet, smtp, http, ftp) def doAuthconfig(self, id, args): |