diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-07-08 03:00:53 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-07-08 03:00:53 +0000 |
| commit | 459119c94529602d08de465b7ebfa4871d328081 (patch) | |
| tree | 369a7eb643938d6d51ef6f2d0c46561e61dcc0ae /kickstart.py | |
| parent | 390977d3ee0ebc010168ce04573f63ae15458718 (diff) | |
| download | anaconda-459119c94529602d08de465b7ebfa4871d328081.tar.gz anaconda-459119c94529602d08de465b7ebfa4871d328081.tar.xz anaconda-459119c94529602d08de465b7ebfa4871d328081.zip | |
massive merge from taroon branch. changes are all over the place, but a
summary of looking through the diff is
* clean up warnings, we build with -Wall -Werror here too
* product.img stuff
* max logical partitions enforcement
* 1 TB max fs size
* ethtool stuff
* autopart in kickstart
* driver disk fixes
* RHEL upgrade stuff
* network driver disks
* variant pkgorder/tree splitting
Diffstat (limited to 'kickstart.py')
| -rw-r--r-- | kickstart.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/kickstart.py b/kickstart.py index 328fd24a2..107139f11 100644 --- a/kickstart.py +++ b/kickstart.py @@ -425,13 +425,14 @@ class KickstartBase(BaseInstallClass): # nodns is only used by the loader (args, extra) = isys.getopt(args, '', [ 'bootproto=', 'ip=', 'netmask=', 'gateway=', 'nameserver=', - 'nodns', 'device=', 'hostname=']) + 'nodns', 'device=', 'hostname=', 'ethtool=']) bootProto = "dhcp" ip = None netmask = "" gateway = "" nameserver = "" hostname = "" + ethtool = "" device = None for n in args: (str, arg) = n @@ -449,8 +450,10 @@ class KickstartBase(BaseInstallClass): device = arg elif str == "--hostname": hostname = arg + elif str== "--ethtool": + ethtool = arg - self.setNetwork(id, bootProto, ip, netmask, device=device) + self.setNetwork(id, bootProto, ip, netmask, ethtool, device=device) if hostname != "": self.setHostname(id, hostname) if nameserver != "": @@ -760,6 +763,15 @@ class KickstartBase(BaseInstallClass): # if you want it self.setDefaultPartitioning(id, doClear = 0) + id.partitions.isKickstart = 1 + + self.skipSteps.append("partition") + self.skipSteps.append("partitionmethod") + self.skipSteps.append("partitionmethodsetup") + self.skipSteps.append("fdisk") + self.skipSteps.append("autopartition") + + def defineLogicalVolume(self, id, args): (args, extra) = isys.getopt(args, '', [ 'vgname=', 'size=', |