This patch adds support for iswmd parameter in booty.
Subject: [PATCH 5/5] booty changes for iswmd
---
booty/util.py | 4 +++-
booty/x86.py | 11 +++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/booty/util.py b/booty/util.py
index 74ba561..ddc2a51 100644
--- a/booty/util.py
+++ b/booty/util.py
@@ -1,11 +1,13 @@
import string
+from flags import flags
def getDiskPart(dev, storage):
path = storage.devicetree.getDeviceByName(dev).path[5:]
cut = len(dev)
if (path.startswith('rd/') or path.startswith('ida/') or
path.startswith('cciss/') or path.startswith('sx8/') or
- path.startswith('mapper/') or path.startswith('mmcblk')):
+ path.startswith('mapper/') or path.startswith('mmcblk') or
+ (path.startswith('md') and (flags.cmdline.has_key("iswmd")))):
if dev[-2] == 'p':
cut = -1
elif dev[-3] == 'p':
diff --git a/booty/x86.py b/booty/x86.py
index 84d2625..19ccbc8 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
@@ -54,6 +55,9 @@ class x86BootloaderInfo(efiBootloaderInfo):
if path.startswith("mapper/luks-"):
return []
+ if flags.cmdline.has_key("iswmd"):
+ return [device]
+
if path.startswith('md'):
bootable = 0
parts = checkbootloader.getRaidDisks(device, self.storage,
@@ -329,8 +333,11 @@ 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'):
+ if flags.cmdline.has_key("iswmd"):
+ f.write("(%s) %s\n" % (self.grubbyDiskName(drive), path))
+ else:
+ f.write("(%s) %s\n" % (self.grubbyDiskName(drive), path))
f.close()
sysconf = '/etc/sysconfig/grub'
--
1.6.3.1.54.g99dd
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
