Apply patch for module blacklisting from gentoo bug #282148
authorAndrew Gaffney <agaffney@gentoo.org>
Sun, 23 Aug 2009 16:00:34 +0000 (11:00 -0500)
committerAndrew Gaffney <agaffney@gentoo.org>
Sun, 23 Aug 2009 16:00:34 +0000 (11:00 -0500)
ChangeLog
modules/catalyst/target/livecd_stage2.py

index 7ec39d90b24c7b24dd168f25355c9fff3a5562e2..c0e43844b98fd25b0a923117530d57b640b66f66 100644 (file)
--- 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 <agaffney@gentoo.org>
+  modules/catalyst/target/livecd_stage2.py:
+  Apply patch for module blacklisting from gentoo bug #282148
+
   28 Jun 2009; Andrew Gaffney <agaffney@gentoo.org> files/livecd/README.txt,
   files/livecd/x86-F6.msg:
   Apply patch to document espeakup support for gentoo bug #267708
index ac2f939edf35e45dc865b6e8ff91e6b57e5c92e1..7e0bbd828b99b6adfc7f6acbbf9124f4b794cd39 100644 (file)
@@ -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):