From 6bd867f7ac8e8db35a8b1b453fdc5c046d4b7091 Mon Sep 17 00:00:00 2001 From: Mike Fulbright Date: Tue, 13 Mar 2001 00:22:15 +0000 Subject: fix for bug 29544 - we were not handling kickstart raid specifications which used --onpart correctly --- kickstart.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'kickstart.py') diff --git a/kickstart.py b/kickstart.py index e72fdf9ee..0feefce2e 100644 --- a/kickstart.py +++ b/kickstart.py @@ -43,8 +43,25 @@ class Script: class KickstartBase(BaseInstallClass): def mergeFstabEntries(self, todo): + # this is pretty bad - needs complete rewrite of how we handle + # --onpart specified partitions. + # + # we DO NOT want to add raid type partitions at this point + # because they are not going to be mounted on final system + # HOWEVER, they are in the install class fstab because we need + # them there to map from existing partitions to the 'raid.xx' + # name we use in the ks.cfg to designate components of a raid + # device which also have a --onpart directive. + raidFilter = {} + for (mntPoint, raidDev, level, devices) in self.raidList: + for dev in devices: + raidFilter[dev] = 1 + for (mntpoint, (dev, fstype, reformat)) in self.fstab: - todo.fstab.addMount(dev, mntpoint, fstype, reformat) + if raidFilter and raidFilter.has_key(mntpoint): + continue + else: + todo.fstab.addMount(dev, mntpoint, fstype, reformat) def postAction(self, rootPath, serial): for script in self.postScripts: -- cgit