From: Andrew Gaffney Date: Sun, 23 Aug 2009 15:58:36 +0000 (-0500) Subject: Apply patch for module blacklisting from gentoo bug #282148 X-Git-Tag: CATALYST_2_0_6_916~27 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9bc21e7c2d528338f99774ecfe42e1844e464e73;p=catalyst.git Apply patch for module blacklisting from gentoo bug #282148 --- diff --git a/ChangeLog b/ChangeLog index f25eba36..4b7b69f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for catalyst -# Copyright 2003-2008 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS) +# Copyright 1999-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS) # Distributed under the GPL v2 + 23 Aug 2009; Andrew Gaffney + modules/livecd_stage2_target.py: + Apply patch for module blacklisting from gentoo bug #282148 + 07 Jul 2009; Chris Gianelloni catalyst: Version bumping to 2.0.6.905 for release. diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py index 147148f7..2b126ed2 100644 --- a/modules/livecd_stage2_target.py +++ b/modules/livecd_stage2_target.py @@ -59,14 +59,14 @@ class livecd_stage2_target(generic_stage_target): # what modules do we want to blacklist? if self.settings.has_key("livecd/modblacklist"): 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):