The previous patch causes a traceback anytime users try to create
lvm, btrfs, md member device partitions via kickstart. This fixes
the traceback and also achieves the original intent, which was to
improve our ability to resolve kickstart block device specs
correctly.
New subject: [PATCH] Fix kickstart block device resolution. (#1022206)
---
pyanaconda/kickstart.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 522022f..e2a2757 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -337,7 +337,7 @@ class BTRFSData(commands.btrfs.F17_BTRFSData):
if not dev:
# if using --onpart, use original device
member_name = ksdata.onPart.get(member, member)
- dev = devicetree.resolveDevice(member_name or lookupAlias(devicetree,
member))
+ dev = devicetree.resolveDevice(member_name) or lookupAlias(devicetree,
member)
if dev and dev.format.type == "luks":
try:
@@ -1181,7 +1181,7 @@ class RaidData(commands.raid.F18_RaidData):
if not dev:
# if member is using --onpart, use original device
mem = ksdata.onPart.get(member, member)
- dev = devicetree.resolveDevice(mem or lookupAlias(devicetree, member))
+ dev = devicetree.resolveDevice(mem) or lookupAlias(devicetree, member)
if dev and dev.format.type == "luks":
try:
dev = devicetree.getChildren(dev)[0]
@@ -1406,7 +1406,7 @@ class VolGroupData(commands.volgroup.FC16_VolGroupData):
if not dev:
# if pv is using --onpart, use original device
pv_name = ksdata.onPart.get(pv, pv)
- dev = devicetree.resolveDevice(pv_name or lookupAlias(devicetree, pv))
+ dev = devicetree.resolveDevice(pv_name) or lookupAlias(devicetree, pv)
if dev and dev.format.type == "luks":
try:
dev = devicetree.getChildren(dev)[0]
--
1.8.1.4