diff options
author | Jeremy Katz <katzj@redhat.com> | 2004-11-17 02:40:06 +0000 |
---|---|---|
committer | Jeremy Katz <katzj@redhat.com> | 2004-11-17 02:40:06 +0000 |
commit | 6efd407a10528e090aaac0ef5215ac3173cfa94b (patch) | |
tree | 2678c4130cfff83fb72198ff9fff5dc279ef1e1c /kickstart.py | |
parent | 99b7af9d736570472756e297f097029d91294f75 (diff) | |
download | anaconda-6efd407a10528e090aaac0ef5215ac3173cfa94b.tar.gz anaconda-6efd407a10528e090aaac0ef5215ac3173cfa94b.tar.xz anaconda-6efd407a10528e090aaac0ef5215ac3173cfa94b.zip |
(merge from rhel4-branch)
2004-11-16 Jeremy Katz <katzj@redhat.com>
* loader2/net.c (setKickstartNetwork): Allow passing --notksdevice
to your network lines so that you don't try to use them as your
device (#136903)
* kickstart.py (KickstartBase.doNetwork): Handle --notksdevice
here too.
* loader2/net.c: Allow going back and manually changing the
network device used even if ksdevice= is passed (#136903)
* loader2/loader.c: Fix for serial console magic to work again
with just console= and not explicit serial (#137971)
Diffstat (limited to 'kickstart.py')
-rw-r--r-- | kickstart.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kickstart.py b/kickstart.py index b8bae4c19..b607b2e90 100644 --- a/kickstart.py +++ b/kickstart.py @@ -530,7 +530,7 @@ class KickstartBase(BaseInstallClass): (args, extra) = isys.getopt(args, '', [ 'bootproto=', 'ip=', 'netmask=', 'gateway=', 'nameserver=', 'nodns', 'device=', 'hostname=', 'ethtool=', 'onboot=', - 'dhcpclass=', 'essid=', 'wepkey=']) + 'dhcpclass=', 'essid=', 'wepkey=', 'notksdevice']) bootProto = "dhcp" ip = None netmask = "" |