[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH 3/9] 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.
---
 installclasses/fedora.py |    9 +++++----
 installclasses/rhel.py   |   10 ++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/installclasses/fedora.py b/installclasses/fedora.py
index 087e2d3..d2ddafa 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 5217928..da25946 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
-- 
1.6.1.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]