diff options
author | Jacek Danecki <Jacek.Danecki@intel.com> | 2009-06-22 18:47:08 +0200 |
---|---|---|
committer | Hans de Goede <hdegoede@redhat.com> | 2009-06-22 18:47:08 +0200 |
commit | d170c67b33313b9abd4d5906407909ed98b0a4ee (patch) | |
tree | 26caf188943eef137fdc6ffab99a865a3e538c46 /booty/x86.py | |
parent | 9e4d2e76713c9c71dcdaf22767211c13be9b3668 (diff) | |
download | anaconda-d170c67b33313b9abd4d5906407909ed98b0a4ee.tar.gz anaconda-d170c67b33313b9abd4d5906407909ed98b0a4ee.tar.xz anaconda-d170c67b33313b9abd4d5906407909ed98b0a4ee.zip |
booty changes for iswmd
This patch adds support for iswmd kernel parameter in booty.
Diffstat (limited to 'booty/x86.py')
-rw-r--r-- | booty/x86.py | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/booty/x86.py b/booty/x86.py index 8ba5d23e8..4137bf40e 100644 --- a/booty/x86.py +++ b/booty/x86.py @@ -4,6 +4,7 @@ import string from booty import BootyNoKernelWarning from util import getDiskPart from bootloaderInfo import * +from flags import flags import checkbootloader import iutil import rhpl @@ -51,12 +52,16 @@ class x86BootloaderInfo(efiBootloaderInfo): if path.startswith("mapper/luks-"): return [] + if path.startswith('md'): - bootable = 0 - parts = checkbootloader.getRaidDisks(device, self.storage, + if flags.cmdline.has_key("iswmd"): + return [device] + else: + bootable = 0 + parts = checkbootloader.getRaidDisks(device, self.storage, raidLevel=1, stripPart=0) - parts.sort() - return parts + parts.sort() + return parts return [device] @@ -332,8 +337,9 @@ class x86BootloaderInfo(efiBootloaderInfo): # XXX hack city. If they're not the sort of thing that'll # be in the device map, they shouldn't still be in the list. path = self.storage.devicetree.getDeviceByName(drive).path - if not drive.startswith('md'): - f.write("(%s) %s\n" % (self.grubbyDiskName(drive), path)) + if ((drive.startswith('md') and flags.cmdline.has_key("iswmd")) or + not drive.startswith('md')): + f.write("(%s) %s\n" % (self.grubbyDiskName(drive), path)) f.close() sysconf = '/etc/sysconfig/grub' |