diff options
| author | Jeremy Katz <katzj@redhat.com> | 2001-07-06 02:04:45 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2001-07-06 02:04:45 +0000 |
| commit | 5c3315cad6444772b7fdaf60532861826169dd45 (patch) | |
| tree | 9bfde377032cec77ac62bc16c110572089ad3806 | |
| parent | dde35fa5cfcd1151a05a8d4efa0609f723cb58e1 (diff) | |
| download | anaconda-5c3315cad6444772b7fdaf60532861826169dd45.tar.gz anaconda-5c3315cad6444772b7fdaf60532861826169dd45.tar.xz anaconda-5c3315cad6444772b7fdaf60532861826169dd45.zip | |
some architectures don't care about /boot but want something different
instead (say /boot/efi)
| -rw-r--r-- | installclasses/custom.py | 7 | ||||
| -rw-r--r-- | installclasses/server.py | 5 | ||||
| -rw-r--r-- | installclasses/workstation.py | 9 | ||||
| -rw-r--r-- | partitioning.py | 9 |
4 files changed, 24 insertions, 6 deletions
diff --git a/installclasses/custom.py b/installclasses/custom.py index 5451121b8..7377d57b4 100644 --- a/installclasses/custom.py +++ b/installclasses/custom.py @@ -18,8 +18,11 @@ class InstallClass(BaseInstallClass): BaseInstallClass.setInstallData(self, id) self.setHostname(id, "localhost.localdomain") - autorequests = [ ("/", None, 700, None, 1, 1), - ("/boot", None, 50, None, 0, 1) ] + autorequests = [ ("/", None, 700, None, 1, 1) ] + + bootreq = getAutopartitionBoot() + if bootreq: + autorequests.append(bootreq) (minswap, maxswap) = iutil.swapSuggestion() autorequests.append((None, "swap", minswap, maxswap, 1, 1)) diff --git a/installclasses/server.py b/installclasses/server.py index 23b2be85f..3c3d1db0d 100644 --- a/installclasses/server.py +++ b/installclasses/server.py @@ -39,10 +39,13 @@ class InstallClass(BaseInstallClass): self.setHostname(id, "localhost.localdomain") autorequests = [ ("/", None,256, None, 1, 1), - ("/boot", None, 50, None, 0, 1), ("/usr", None, 800, None, 0, 1), ("/var", None, 256, None, 0, 1), ("/home", None, 512, None, 1, 1) ] + + bootreq = getAutopartitionBoot() + if bootreq: + autorequests.append(bootreq) (minswap, maxswap) = iutil.swapSuggestion() autorequests.append((None, "swap", minswap, maxswap, 1, 1)) diff --git a/installclasses/workstation.py b/installclasses/workstation.py index 4c0bcd5eb..befa5c10a 100644 --- a/installclasses/workstation.py +++ b/installclasses/workstation.py @@ -25,14 +25,17 @@ class InstallClass(BaseInstallClass): def setGroupSelection(self, comps): BaseInstallClass.__init__(self, comps) - self.showGroups(comps, [ "KDE", ("GNOME", 1), "Games" ] ) + self.showGroups(comps, [ "KDE", ("GNOME", 1), "Games and Entertainment" ] ) def setInstallData(self, id): BaseInstallClass.setInstallData(self, id) self.setHostname(id, "localhost.localdomain") - autorequests = [ ("/", None, 1100, None, 1, 1), - ("/boot", None, 50, None, 0, 1) ] + 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)) diff --git a/partitioning.py b/partitioning.py index 6fb150769..b3bf35859 100644 --- a/partitioning.py +++ b/partitioning.py @@ -1003,6 +1003,15 @@ def autoCreatePartitionRequests(autoreq): return requests +# returns shorthand (see above) request for the "boot" dir +# depends on arch +def getAutopartitionBoot(): + if iutil.getArch() == "ia64": + return ("/boot/efi", "vfat", 100, None, 0, 1) + else: + return ("/boot", None, 50, None, 0, 1) + + def confirmDeleteRequest(intf, request): if request.device: errmsg = _("You are about to delete the /dev/%s partition.\n\nAre you sure?" % request.device) |