diff options
| author | Jeremy Katz <katzj@redhat.com> | 2004-05-11 21:51:13 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2004-05-11 21:51:13 +0000 |
| commit | 95be2d9d4432fa13e7a32b7285193363742a7c99 (patch) | |
| tree | 572f1a1bbff104b2a3ad72d1924c81e66cd9b7de /kickstart.py | |
| parent | 6aab747e829579b305e0360349a8b86a3104ea15 (diff) | |
| download | anaconda-95be2d9d4432fa13e7a32b7285193363742a7c99.tar.gz anaconda-95be2d9d4432fa13e7a32b7285193363742a7c99.tar.xz anaconda-95be2d9d4432fa13e7a32b7285193363742a7c99.zip | |
merge from rhel3. allow --enable and --enabled and --disable and --disabled
everywhere for consistency
Diffstat (limited to 'kickstart.py')
| -rw-r--r-- | kickstart.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/kickstart.py b/kickstart.py index 10f1350aa..604170d4c 100644 --- a/kickstart.py +++ b/kickstart.py @@ -98,7 +98,8 @@ class KickstartBase(BaseInstallClass): def doFirewall(self, id, args): (args, extra) = isys.getopt(args, '', [ 'dhcp', 'ssh', 'telnet', 'smtp', 'http', 'ftp', 'enabled', - 'port=', 'high', 'medium', 'disabled', 'trust=' ]) + 'enable' 'port=', 'high', 'medium', 'disabled', 'disable', + 'trust=' ]) ssh = 0 telnet = 0 @@ -124,9 +125,9 @@ class KickstartBase(BaseInstallClass): elif str == '--high' or str == '--medium': log("used deprecated firewall option: %s" %(str[2:],)) enable = 1 - elif str == '--enabled': + elif str == '--enabled' or str == "--enable": enable = 1 - elif str == '--disabled': + elif str == '--disabled' or str == "--disable": enable = 0 elif str == '--trust': trusts.append(arg) @@ -329,7 +330,8 @@ class KickstartBase(BaseInstallClass): def doFirstboot(self, id, args): (args, extra) = isys.getopt(args, '', - ['reconfig', 'enable', 'disable']) + ['reconfig', 'enable', 'enabled' + 'disable', 'disabled']) fb = FIRSTBOOT_SKIP @@ -337,9 +339,9 @@ class KickstartBase(BaseInstallClass): (str, arg) = n if str == '--reconfig': fb = FIRSTBOOT_RECONFIG - elif str == '--enable': + elif str == '--enable' or str == "--enabled": fb = FIRSTBOOT_DEFAULT - elif str == '--disable': + elif str == '--disable' or str == "--disabled": fb = FIRSTBOOT_SKIP id.firstboot = fb |