From 01cbeef6b8f23d395522864093e6fe4cbcddcbb3 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 19 Oct 2009 16:22:28 +0200
Subject: [PATCH] xbps-base-files: update to 0.29.

Added /etc/modprobe.d/blacklist.conf from Fedora. This makes
the live image work in qemu!

--HG--
extra : convert_revision : 9d8230a58db66f4585247c99b4d644bf40246dec
---
 .../xbps-base-files/files/blacklist.conf      | 39 +++++++++++++++++++
 templates/xbps-base-files/template            |  3 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 templates/xbps-base-files/files/blacklist.conf

diff --git a/templates/xbps-base-files/files/blacklist.conf b/templates/xbps-base-files/files/blacklist.conf
new file mode 100644
index 00000000000..c19b95f4773
--- /dev/null
+++ b/templates/xbps-base-files/files/blacklist.conf
@@ -0,0 +1,39 @@
+#
+# Listing a module here prevents the hotplug scripts from loading it.
+# Usually that'd be so that some other driver will bind it instead,
+# no matter which driver happens to get probed first.  Sometimes user
+# mode tools can also control driver binding.
+#
+# Syntax: driver name alone (without any spaces) on a line. Other
+# lines are ignored.
+
+	
+#watchdog drivers
+blacklist i8xx_tco
+	
+# framebuffer drivers
+blacklist aty128fb
+blacklist atyfb
+blacklist radeonfb
+blacklist i810fb
+blacklist cirrusfb
+blacklist intelfb
+blacklist kyrofb
+blacklist i2c-matroxfb
+blacklist hgafb
+blacklist nvidiafb
+blacklist rivafb
+blacklist savagefb
+blacklist sstfb
+blacklist neofb
+blacklist tridentfb
+blacklist tdfxfb
+blacklist virgefb
+blacklist vga16fb
+	
+# ISDN - see bugs 154799, 159068
+blacklist hisax
+blacklist hisax_fcpcipnp
+	
+# sound drivers
+blacklist snd-pcsp
diff --git a/templates/xbps-base-files/template b/templates/xbps-base-files/template
index b1da6c9c4a5..9d7edb17280 100644
--- a/templates/xbps-base-files/template
+++ b/templates/xbps-base-files/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-base-files'
 pkgname=xbps-base-files
-version=0.28
+version=0.29
 build_style=custom-install
 short_desc="xbps base system files"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -87,4 +87,5 @@ do_install()
 	install -d ${DESTDIR}/etc/modprobe.d
 	install -m644 ${FILESDIR}/usb-load-ehci-first \
 		${DESTDIR}/etc/modprobe.d/usb-load-ehci-first.conf
+	install -m644 ${FILESDIR}/blacklist.conf ${DESTDIR}/etc/modprobe.d
 }