summaryrefslogtreecommitdiffstats
path: root/installclass.py
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-04-24 15:46:31 +0000
committerJeremy Katz <katzj@redhat.com>2003-04-24 15:46:31 +0000
commit0a562126d84c59a113231ae7ab38984f92d62153 (patch)
tree5e87b9094f4ebdc328979e3a0640dee5f1fc40cb /installclass.py
parentdd200d781bd9012f562399c2ee69c23fe60d86b9 (diff)
downloadanaconda-0a562126d84c59a113231ae7ab38984f92d62153.tar.gz
anaconda-0a562126d84c59a113231ae7ab38984f92d62153.tar.xz
anaconda-0a562126d84c59a113231ae7ab38984f92d62153.zip
another taroon merge. tagged before as before-taroon-merge, after as
after-taroon-merge this one adds s390 fixes, basic i/p series platform support, support for multiple kernels and one second stage, cmdline kickstart mode (nice for s390), some warning cleanups.
Diffstat (limited to 'installclass.py')
-rw-r--r--installclass.py30
1 files changed, 17 insertions, 13 deletions
diff --git a/installclass.py b/installclass.py
index e117ad5e3..605d225f8 100644
--- a/installclass.py
+++ b/installclass.py
@@ -147,29 +147,33 @@ class BaseInstallClass:
if not BETANAG:
dispatch.skipStep("betanag")
- # XXX ugh, this badly needs some clean up
- if iutil.getArch() == "x86_64":
+ if iutil.getArch() != "i386":
dispatch.skipStep("bootdisk")
- elif (iutil.getArch() == "alpha" or iutil.getArch() == "ia64" or
+
+ if (iutil.getArch() == "alpha" or iutil.getArch() == "ia64" or
iutil.getArch() == "sparc" or iutil.getArch() == "ppc"):
- dispatch.skipStep("bootdisk")
dispatch.skipStep("bootloader")
- elif iutil.getArch() == "s390":
+
+ # 'noupgrade' can be used on the command line to force not looking
+ # for partitions to upgrade. useful in some cases...
+ cmdline = open("/proc/cmdline", "r").read()
+ if cmdline.find("noupgrade") != -1:
+ dispatch.skipStep("findrootparts")
+
+ # called from anaconda so that we can skip steps in the headless case
+ # in a perfect world, the steps would be able to figure this out
+ # themselves by looking at instdata.headless. but c'est la vie.
+ def setAsHeadless(self, dispatch, isHeadless = 0):
+ if isHeadless == 0:
+ pass
+ else:
dispatch.skipStep("keyboard", permanent = 1)
dispatch.skipStep("mouse", permanent = 1)
- dispatch.skipStep("fdisk", permanent = 1)
dispatch.skipStep("handleX11pkgs", permanent = 1)
dispatch.skipStep("videocard", permanent = 1)
dispatch.skipStep("monitor", permanent = 1)
dispatch.skipStep("xcustom", permanent = 1)
dispatch.skipStep("writexconfig", permanent = 1)
- dispatch.skipStep("bootdisk", permanent = 1)
-
- # 'noupgrade' can be used on the command line to force not looking
- # for partitions to upgrade. useful in some cases...
- cmdline = open("/proc/cmdline", "r").read()
- if cmdline.find("noupgrade") != -1:
- dispatch.skipStep("findrootparts")
# This is called after the hdlist is read in.
def setPackageSelection(self, hdlist, intf):