aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2013-08-01 22:59:10 -0700
committerBrian Dolbec <dolsen@gentoo.org>2013-08-01 22:59:10 -0700
commit1082b4471613842494261d74ec2598b4191056c9 (patch)
tree3dbf767c66aea349047405d3afc2fc5cfd6fee5e
parentcorrectly remove USE=build (diff)
downloadcatalyst-1082b4471613842494261d74ec2598b4191056c9.tar.gz
catalyst-1082b4471613842494261d74ec2598b4191056c9.tar.bz2
catalyst-1082b4471613842494261d74ec2598b4191056c9.zip
Fix incorrect type for livecd/modblacklist.
Bug reported by tstellar.
-rw-r--r--modules/livecd_stage2_target.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py
index f816b214..5be8fd23 100644
--- a/modules/livecd_stage2_target.py
+++ b/modules/livecd_stage2_target.py
@@ -68,6 +68,9 @@ class livecd_stage2_target(generic_stage_target):
raise CatalystError,"Couldn't open "+self.settings["chroot_path"]+"/etc/modprobe.d/blacklist.conf."
myf.write("\n#Added by Catalyst:")
+ # workaround until config.py is using configparser
+ if isinstance(self.settings["livecd/modblacklist"], str):
+ self.settings["livecd/modblacklist"] = self.settings["livecd/modblacklist"].split()
for x in self.settings["livecd/modblacklist"]:
myf.write("\nblacklist "+x)
myf.close()