diff options
| author | Peter Jones <pjones@redhat.com> | 2005-02-23 23:15:45 +0000 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2005-02-23 23:15:45 +0000 |
| commit | 63402e5aac443c40c527edefd5792af8244edbdb (patch) | |
| tree | e85ea1ee280604e38bdf2fb79a1ebf7fae372145 | |
| parent | 2710bbf343343102315e62812fb83b109012afab (diff) | |
| download | anaconda-63402e5aac443c40c527edefd5792af8244edbdb.tar.gz anaconda-63402e5aac443c40c527edefd5792af8244edbdb.tar.xz anaconda-63402e5aac443c40c527edefd5792af8244edbdb.zip | |
put the apple bootloader stuff in the kickstart list, and remove it from
the raid and lvm possibilities early on
| -rw-r--r-- | iw/lvm_dialog_gui.py | 2 | ||||
| -rw-r--r-- | iw/raid_dialog_gui.py | 2 | ||||
| -rw-r--r-- | kickstart.py | 3 | ||||
| -rw-r--r-- | partitions.py | 2 | ||||
| -rw-r--r-- | textw/partition_text.py | 4 |
5 files changed, 9 insertions, 4 deletions
diff --git a/iw/lvm_dialog_gui.py b/iw/lvm_dialog_gui.py index e964c62b3..59a7e5194 100644 --- a/iw/lvm_dialog_gui.py +++ b/iw/lvm_dialog_gui.py @@ -382,7 +382,7 @@ class VolumeGroupEditor: newfstypeCombo = createFSTypeMenu(logrequest.fstype, fstypechangeCB, mountCombo, - ignorefs = ["software RAID", "physical volume (LVM)", "vfat", "PPC PReP Boot"]) + ignorefs = ["software RAID", "physical volume (LVM)", "vfat", "PPC PReP Boot", "Apple Bootstrap"]) lbl.set_mnemonic_widget(newfstypeCombo) else: maintable.attach(createAlignedLabel(_("Original File System Type:")), diff --git a/iw/raid_dialog_gui.py b/iw/raid_dialog_gui.py index eea96f9d0..8560703a1 100644 --- a/iw/raid_dialog_gui.py +++ b/iw/raid_dialog_gui.py @@ -295,7 +295,7 @@ class RaidEditor: self.fstypeCombo = createFSTypeMenu(origrequest.fstype, fstypechangeCB, self.mountCombo, - ignorefs = ["software RAID", "PPC PReP Boot"]) + ignorefs = ["software RAID", "PPC PReP Boot", "Apple Bootstrap"]) lbl.set_mnemonic_widget(self.fstypeCombo) else: if origrequest.fstype.getName(): diff --git a/kickstart.py b/kickstart.py index a5c17d0d7..815e7343d 100644 --- a/kickstart.py +++ b/kickstart.py @@ -1270,6 +1270,9 @@ class KickstartBase(BaseInstallClass): filesystem = fileSystemTypeGet(fstype) else: filesystem = fileSystemTypeGetDefault() + elif extra[0] == 'appleboot': + filesystem = fileSystemTypeGet("Apple Bootstrap") + mountpoint = None elif extra[0] == 'prepboot': filesystem = fileSystemTypeGet("PPC PReP Boot") mountpoint = None diff --git a/partitions.py b/partitions.py index cc6e74f49..fd80e618d 100644 --- a/partitions.py +++ b/partitions.py @@ -1019,6 +1019,8 @@ class Partitions: args.append("pv.%s" % (request.uniqueID)) elif request.fstype.getName() == "PPC PReP Boot": args.extend(["prepboot", "--fstype", "\"PPC PReP Boot\""]) + elif request.fstype.getName() == "Apple Bootstrap": + args.extend(["appleboot", "--fstype", "\"Apple Bootstrap\""]) elif request.mountpoint: fstype = request.fstype.getName() if fstype.find(" ") > 0: diff --git a/textw/partition_text.py b/textw/partition_text.py index 25052c5d0..8dcdce89b 100644 --- a/textw/partition_text.py +++ b/textw/partition_text.py @@ -985,7 +985,7 @@ class PartitionWindow: self.drivelist = None else: subgrid = Grid(2, 1) - (fstype, fsgrid) = self.makeFsList(raidrequest, ignorefs = ["software RAID", "PPC PReP Boot"]) + (fstype, fsgrid) = self.makeFsList(raidrequest, ignorefs = ["software RAID", "PPC PReP Boot", "Apple Bootstrap"]) subgrid.setField(fsgrid, 0, 0, anchorLeft = 1, anchorTop=1) (raidtype, raidgrid) = self.makeRaidList(raidrequest) subgrid.setField(raidgrid, 1, 0, (2,0,0,0), anchorRight=1, anchorTop=1) @@ -1164,7 +1164,7 @@ class PartitionWindow: self.drivelist = None else: subgrid = Grid(2, 1) - (fstype, fsgrid) = self.makeFsList(lvrequest, ignorefs = ["software RAID", "PPC PReP Boot"]) + (fstype, fsgrid) = self.makeFsList(lvrequest, ignorefs = ["software RAID", "PPC PReP Boot", "Apple Bootstrap"]) subgrid.setField(fsgrid, 0, 0, anchorLeft = 1, anchorTop=1) vgs = self.partitions.getLVMVGRequests() |