summaryrefslogtreecommitdiffstats
path: root/installclasses
diff options
context:
space:
mode:
authorMike Fulbright <msf@redhat.com>2001-03-08 22:51:22 +0000
committerMike Fulbright <msf@redhat.com>2001-03-08 22:51:22 +0000
commit922a2a020c1c98dd4c7fd14b5305e0744d463a5d (patch)
treeeaaeb6d3123c272f6aa5ed677de1e11ce827e5ec /installclasses
parent907b20f75bcdf1c9e96bc5f18cc20d4a9435769c (diff)
downloadanaconda-922a2a020c1c98dd4c7fd14b5305e0744d463a5d.tar.gz
anaconda-922a2a020c1c98dd4c7fd14b5305e0744d463a5d.tar.xz
anaconda-922a2a020c1c98dd4c7fd14b5305e0744d463a5d.zip
bump sizes of autoallocation attempts to reflect new sizes of components, as well as 2.4 swap requirements
Diffstat (limited to 'installclasses')
-rw-r--r--installclasses/custom.py10
-rw-r--r--installclasses/server.py11
-rw-r--r--installclasses/workstation.py12
3 files changed, 25 insertions, 8 deletions
diff --git a/installclasses/custom.py b/installclasses/custom.py
index aa47c1300..1fbbfaea6 100644
--- a/installclasses/custom.py
+++ b/installclasses/custom.py
@@ -2,6 +2,7 @@ from installclass import BaseInstallClass
from installclass import FSEDIT_CLEAR_LINUX
from translate import N_
import os
+import iutil
# custom installs are easy :-)
class InstallClass(BaseInstallClass):
@@ -15,11 +16,14 @@ class InstallClass(BaseInstallClass):
BaseInstallClass.__init__(self)
if os.uname ()[4] != 'sparc64':
- self.addNewPartition('/boot', (16, -1, 0), (None,-1,0), (0,0))
+ self.addNewPartition('/boot', (32, -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."))
+ # 2.4 kernel requires more swap, so base amount we try to get
+ # on amount of memory
+ (minswap, maxswap) = iutil.swapSuggestion()
+ self.addNewPartition('swap', (minswap, maxswap, 1), (None, -1, 0), (0,0))
+
diff --git a/installclasses/server.py b/installclasses/server.py
index 580622afe..e0eac0ad6 100644
--- a/installclasses/server.py
+++ b/installclasses/server.py
@@ -2,6 +2,7 @@ from installclass import BaseInstallClass
from translate import *
from installclass import FSEDIT_CLEAR_ALL
import os
+import iutil
class InstallClass(BaseInstallClass):
@@ -28,12 +29,18 @@ class InstallClass(BaseInstallClass):
"DNS Name Server" ]
if os.uname ()[4] != 'sparc64':
- self.addNewPartition('/boot', (16, -1, 0), (None, -1, 0), (0,0))
+ self.addNewPartition('/boot', (32, -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."))
+
+# self.addNewPartition('swap', (64, 256, 1), (None, -1, 0), (0,0))
+
+ # 2.4 kernel requires more swap, so base amount we try to get
+ # on amount of memory
+ (minswap, maxswap) = iutil.swapSuggestion()
+ self.addNewPartition('swap', (minswap, maxswap, 1), (None, -1, 0), (0,0))
diff --git a/installclasses/workstation.py b/installclasses/workstation.py
index 707983bd8..87e8f0f5c 100644
--- a/installclasses/workstation.py
+++ b/installclasses/workstation.py
@@ -2,6 +2,7 @@ from installclass import BaseInstallClass
from installclass import FSEDIT_CLEAR_LINUX
from translate import N_
import os
+import iutil
class InstallClass(BaseInstallClass):
name = N_("Workstation")
@@ -23,9 +24,14 @@ class InstallClass(BaseInstallClass):
"Games" ]
if os.uname ()[4] != 'sparc64':
- 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.addNewPartition('/boot', (32, -1, 0), (None,-1,0), (0,0))
+ self.addNewPartition('/', (1100, -1, 1), (None, -1, 0), (0,0))
self.setClearParts(FSEDIT_CLEAR_LINUX,
warningText = N_("You are about to erase any preexisting Linux "
"installations on your system."))
+
+
+ # 2.4 kernel requires more swap, so base amount we try to get
+ # on amount of memory
+ (minswap, maxswap) = iutil.swapSuggestion()
+ self.addNewPartition('swap', (minswap, maxswap, 1), (None, -1, 0), (0,0))