summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lehman <dlehman@redhat.com>2010-02-22 15:08:28 -0600
committerDavid Lehman <dlehman@redhat.com>2010-02-22 17:09:27 -0600
commitf6f1326dd20b24c4b6dcaf6c5fcc233debc566c6 (patch)
treee81e806b20e26e568687f68d56809aff0afc5f35
parent34b4759a76db7e92b2f80e2af0225d335e3a2a09 (diff)
downloadanaconda-f6f1326dd20b24c4b6dcaf6c5fcc233debc566c6.tar.gz
anaconda-f6f1326dd20b24c4b6dcaf6c5fcc233debc566c6.tar.xz
anaconda-f6f1326dd20b24c4b6dcaf6c5fcc233debc566c6.zip
Fix creation of encrypted md members and pvs in kickstart. (#567396)
-rw-r--r--kickstart.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/kickstart.py b/kickstart.py
index 64e372da0..7a0092108 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -831,6 +831,11 @@ class RaidData(commands.raid.F12_RaidData):
# if member is using --onpart, use original device
member = anaconda.ksdata.onPart.get(member, member)
dev = devicetree.getDeviceByName(member)
+ if dev and dev.format.type == "luks":
+ try:
+ dev = devicetree.getChildren(dev)[0]
+ except IndexError:
+ dev = None
if not dev:
raise KickstartValueError, formatErrorMsg(self.lineno, msg="Tried to use undefined partition %s in RAID specification" % member)
@@ -958,6 +963,11 @@ class VolGroupData(commands.volgroup.FC3_VolGroupData):
# if pv is using --onpart, use original device
pv = anaconda.ksdata.onPart.get(pv, pv)
dev = devicetree.getDeviceByName(pv)
+ if dev and dev.format.type == "luks":
+ try:
+ dev = devicetree.getChildren(dev)[0]
+ except IndexError:
+ dev = None
if not dev:
raise KickstartValueError, formatErrorMsg(self.lineno, msg="Tried to use undefined partition %s in Volume Group specification" % pv)