summaryrefslogtreecommitdiffstats
path: root/installclasses
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2009-03-11 16:04:55 -0400
committerChris Lumens <clumens@redhat.com>2009-03-12 09:42:06 -0400
commit551c11375d045616789f4817cdea681fa155f228 (patch)
tree56fe8905ca97f95b6ca34fd1825893fbe815fea7 /installclasses
parentd933e3929cf26a9db3317008d100fca2bc245c22 (diff)
downloadanaconda-551c11375d045616789f4817cdea681fa155f228.tar.gz
anaconda-551c11375d045616789f4817cdea681fa155f228.tar.xz
anaconda-551c11375d045616789f4817cdea681fa155f228.zip
Don't set default partitioning in every kickstart case.
Turns out we don't want to do this because it'll result in the default autopart scheme getting used regardless of what other partitioning commands are specified.
Diffstat (limited to 'installclasses')
-rw-r--r--installclasses/fedora.py9
-rw-r--r--installclasses/rhel.py10
2 files changed, 11 insertions, 8 deletions
diff --git a/installclasses/fedora.py b/installclasses/fedora.py
index 087e2d377..d2ddafa1f 100644
--- a/installclasses/fedora.py
+++ b/installclasses/fedora.py
@@ -62,10 +62,11 @@ class InstallClass(BaseInstallClass):
def setInstallData(self, anaconda):
BaseInstallClass.setInstallData(self, anaconda)
- BaseInstallClass.setDefaultPartitioning(self,
- anaconda.id.storage,
- anaconda.platform,
- CLEARPART_TYPE_LINUX)
+ if not anaconda.isKickstart:
+ BaseInstallClass.setDefaultPartitioning(self,
+ anaconda.id.storage,
+ anaconda.platform,
+ CLEARPART_TYPE_LINUX)
def setSteps(self, anaconda):
BaseInstallClass.setSteps(self, anaconda);
diff --git a/installclasses/rhel.py b/installclasses/rhel.py
index 521792862..da25946f3 100644
--- a/installclasses/rhel.py
+++ b/installclasses/rhel.py
@@ -87,10 +87,12 @@ class InstallClass(BaseInstallClass):
def setInstallData(self, anaconda):
BaseInstallClass.setInstallData(self, anaconda)
- BaseInstallClass.setDefaultPartitioning(self,
- anaconda.id.storage,
- anaconda.platform,
- CLEARPART_TYPE_LINUX)
+
+ if not anaconda.isKickstart:
+ BaseInstallClass.setDefaultPartitioning(self,
+ anaconda.id.storage,
+ anaconda.platform,
+ CLEARPART_TYPE_LINUX)
def setSteps(self, anaconda):
dispatch = anaconda.dispatch