diff options
| author | Jeremy Katz <katzj@redhat.com> | 2002-05-06 16:43:00 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2002-05-06 16:43:00 +0000 |
| commit | 88199257963f028f8905cfe7cde7eedfed8594ac (patch) | |
| tree | 5767af021bf27abf35de46576e01c06fbbb9201c /kickstart.py | |
| parent | e78b7f75c4625272f5bffab8a576b477b27c051a (diff) | |
| download | anaconda-88199257963f028f8905cfe7cde7eedfed8594ac.tar.gz anaconda-88199257963f028f8905cfe7cde7eedfed8594ac.tar.xz anaconda-88199257963f028f8905cfe7cde7eedfed8594ac.zip | |
better handling of raid and /boot/efi setting filesystem type to avoid
people being silly and causing things to break (#63821)
Diffstat (limited to 'kickstart.py')
| -rw-r--r-- | kickstart.py | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/kickstart.py b/kickstart.py index a4395ef46..0a97bbaa4 100644 --- a/kickstart.py +++ b/kickstart.py @@ -784,23 +784,24 @@ class KickstartBase(BaseInstallClass): if recommended: (size, maxSize) = iutil.swapSuggestion() grow = 1 + elif extra[0].startswith("raid."): + filesystem = fileSystemTypeGet("software RAID") + + if self.ksRaidMapping.has_key(extra[0]): + raise RuntimeError, "Defined RAID partition %s multiple times" % (extra[0],) + + # XXX use the hackish raid unique ID + thisRaidID = self.raidID + self.ksRaidMapping[extra[0]] = thisRaidID + self.raidID = self.raidID + 1 + # XXX should we let people not do this for some reason? + elif extra[0] == "/boot/efi": + filesystem = fileSystemTypeGet("vfat") + mountpoint = extra[0] else: if fstype: filesystem = fileSystemTypeGet(fstype) mountpoint = extra[0] - elif extra[0][:5] == "raid.": - filesystem = fileSystemTypeGet("software RAID") - - if self.ksRaidMapping.has_key(extra[0]): - raise RuntimeError, "Defined RAID partition %s multiple times" % (extra[0],) - - # XXX use the hackish raid unique ID - thisRaidID = self.raidID - self.ksRaidMapping[extra[0]] = thisRaidID - self.raidID = self.raidID + 1 - elif extra[0:9] == "/boot/efi": - filesystem = fileSystemTypeGet("vfat") - mountpoint = extra[0] else: filesystem = fileSystemTypeGetDefault() mountpoint = extra[0] |