Apply patch for module blacklisting from gentoo bug #282148

diff --git a/ChangeLog b/ChangeLog
index f25eba3600fa234500ad19998f8707cfdff6c66e..4b7b69f5915f3c98f1892e1290743726e49fc52d 100644 (file)
--- 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 <agaffney@gentoo.org>
+  modules/livecd_stage2_target.py:
+  Apply patch for module blacklisting from gentoo bug #282148
+
   07 Jul 2009; Chris Gianelloni <wolf31o2@wolf31o2.org> 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 147148f7d8cde0b0b91e8e13e5b329cad810c540..2b126ed29295ff538016a6407dda9a1e45e00ef6 100644 (file)
--- 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):