From: Andrew Gaffney Date: Sun, 23 Aug 2009 16:00:34 +0000 (-0500) Subject: Apply patch for module blacklisting from gentoo bug #282148 X-Git-Tag: CATALYST-2.0.10~3^2~124 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3832388557281f7cd5668d78b0153e4ce2c31c1f;p=catalyst.git Apply patch for module blacklisting from gentoo bug #282148 --- diff --git a/ChangeLog b/ChangeLog index 7ec39d90..c0e43844 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS) # Distributed under the GPL v2 + 23 Aug 2009; Andrew Gaffney + modules/catalyst/target/livecd_stage2.py: + Apply patch for module blacklisting from gentoo bug #282148 + 28 Jun 2009; Andrew Gaffney files/livecd/README.txt, files/livecd/x86-F6.msg: Apply patch to document espeakup support for gentoo bug #267708 diff --git a/modules/catalyst/target/livecd_stage2.py b/modules/catalyst/target/livecd_stage2.py index ac2f939e..7e0bbd82 100644 --- a/modules/catalyst/target/livecd_stage2.py +++ b/modules/catalyst/target/livecd_stage2.py @@ -58,14 +58,14 @@ class livecd_stage2_target(generic_stage_target): # what modules do we want to blacklist? if "livecd/modblacklist" in self.settings: try: - myf=open(self.settings["chroot_path"]+"/etc/hotplug/blacklist","a") + myf=open(self.settings["chroot_path"]+"/etc/modprobe.d/blacklist.conf","a") except: self.unbind() - raise CatalystError,"Couldn't open "+self.settings["chroot_path"]+"/etc/hotplug/blacklist." + raise CatalystError,"Couldn't open "+self.settings["chroot_path"]+"/etc/modprobe.d/blacklist.conf." myf.write("\n#Added by Catalyst:") for x in self.settings["livecd/modblacklist"]: - myf.write("\n"+x) + myf.write("\nblacklist "+x) myf.close() def unpack(self):