summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--installclasses/server.py12
-rw-r--r--installclasses/workstation.py7
2 files changed, 10 insertions, 9 deletions
diff --git a/installclasses/server.py b/installclasses/server.py
index 62f1198e9..337bfad65 100644
--- a/installclasses/server.py
+++ b/installclasses/server.py
@@ -20,12 +20,12 @@ class InstallClass(BaseInstallClass):
self.setMakeBootdisk(1)
if os.uname ()[4] != 'sparc64':
- self.addNewPartition('/boot', 16, -1, 0, None)
- self.addNewPartition('/', 256, -1, 0, None)
- self.addNewPartition('/usr', 512, -1, 1, None)
- self.addNewPartition('/var', 256, -1, 0, None)
- self.addNewPartition('/home', 512, -1, 1, None)
- self.addNewPartition('swap', 64, 256, 1, None)
+ self.addNewPartition('/boot', (16, -1, 0), (None, -1, 0), (0,0))
+ self.addNewPartition('/', (256, -1, 0), (None, -1, 0), (0,0))
+ self.addNewPartition('/usr', (512, -1, 1), (None, -1, 0), (0,0))
+ self.addNewPartition('/var', (256, -1, 0), (None, -1, 0), (0,0))
+ self.addNewPartition('/home',(512, -1, 1), (None, -1, 0), (0,0))
+ self.addNewPartition('swap', (64, 256, 1), (None, -1, 0), (0,0))
self.setClearParts(FSEDIT_CLEAR_ALL,
warningText = N_("You are about to erase ALL DATA on your hard "
"drive to make room for your Linux installation."))
diff --git a/installclasses/workstation.py b/installclasses/workstation.py
index 50865f8b6..1f4ae5b52 100644
--- a/installclasses/workstation.py
+++ b/installclasses/workstation.py
@@ -15,10 +15,11 @@ class Workstation(BaseInstallClass):
self.addToSkipList("package-selection")
self.setMakeBootdisk(1)
+(size, maxsize, grow, device)
if os.uname ()[4] != 'sparc64':
- self.addNewPartition('/boot', 16, -1, 0, None)
- self.addNewPartition('/', 700, -1, 1, None)
- self.addNewPartition('swap', 64, -1, 0, None)
+ self.addNewPartition('/boot', (16, -1, 0), (None,-1,0), (0,0))
+ self.addNewPartition('/', (700, -1, 1), (None, -1, 0), (0,0))
+ self.addNewPartition('swap', (64, -1, 0), (None, -1, 0), (0,0))
self.setClearParts(FSEDIT_CLEAR_LINUX,
warningText = N_("You are about to erase any preexisting Linux "
"installations on your system."))