merge from taroon. highlights of this time around

* ppc boot constraints
* md5 endianness
* don't prompt to save tracebacks to a floppy without a floppy
* autopart for kickstart
* network configuration in the loader if vnc/display case

1 files changed, 2 insertions, 14 deletions

diff --git a/installclasses/personal_desktop.py b/installclasses/personal_desktop.py
index 564e4564a..caba6b4d8 100644
--- a/installclasses/personal_desktop.py
+++ b/installclasses/personal_desktop.py
@@ -3,7 +3,6 @@ from rhpl.translate import N_
 from constants import *
 import os
 import iutil
-from autopart import getAutopartitionBoot, autoCreatePartitionRequests
 from fsset import *
 
 class InstallClass(BaseInstallClass):
@@ -37,19 +36,8 @@ class InstallClass(BaseInstallClass):
 
     def setInstallData(self, id):
 	BaseInstallClass.setInstallData(self, id)
-
-        autorequests = [ ("/", None, 1100, None, 1, 1) ]
-
-        bootreq = getAutopartitionBoot()
-        if bootreq:
-            autorequests.append(bootreq)
-
-        (minswap, maxswap) = iutil.swapSuggestion()
-        autorequests.append((None, "swap", minswap, maxswap, 1, 1))
-
-        id.partitions.autoClearPartType = CLEARPART_TYPE_LINUX
-        id.partitions.autoClearPartDrives = None
-        id.partitions.autoPartitionRequests = autoCreatePartitionRequests(autorequests)
+        BaseInstallClass.setDefaultPartitioning(self, id.partitions,
+                                                CLEARPART_TYPE_LINUX)
 
     def __init__(self, expert):
 	BaseInstallClass.__init__(self, expert)