fix bug #701: blacklist nvidiafb

diff --git a/Makefile b/Makefile
index ee9f3b2966dfd3e9a3e151faf99dab11f8969de8..e5f90175f4ffaab028b609a3dc64bfa8ad503bc8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -93,6 +93,7 @@ install: country.dat vznet.conf vzdump.conf vzdump-hook-script.pl pve-apt.conf p
        install -d ${DESTDIR}/var/lib/vz/template/qemu
        install -D -m 0644 pve-apt.conf ${DESTDIR}/etc/apt/apt.conf.d/75pveconf
        install -D -m 0644 pve-sources.list ${DESTDIR}/etc/apt/sources.list.d/pve-enterprise.list
+       install -D -m 0644 pve-blacklist.conf ${DESTDIR}/etc/modprobe.d/pve-blacklist.conf
        install -D -m 0644 pve-repo-ca-certificates.crt ${DESTDIR}/etc/apt/pve-repo-ca-certificates.crt
        install -D -m 0644 vzdump.conf ${DESTDIR}/etc/vzdump.conf
        install -D -m 0755 vznet.conf ${DESTDIR}/etc/vz/vznet.conf

diff --git a/debian/conffiles b/debian/conffiles
index 0acb6aac745b4c700a8f352e64632c307949ad72..b91e7284886a35abca9572f9f13cf35bbfe78d1c 100644 (file)
--- a/debian/conffiles
+++ b/debian/conffiles
@@ -14,3 +14,4 @@
 /etc/network/if-post-down.d/vlan
 /etc/network/if-up.d/bridgevlan
 /etc/network/if-up.d/bridgevlanport
+/etc/modprobe.d/pve-blacklist.conf

diff --git a/pve-blacklist.conf b/pve-blacklist.conf
new file mode 100644 (file)
index 0000000..9687961
--- /dev/null
+++ b/pve-blacklist.conf
@@ -0,0 +1,4 @@
+# This file contains a list of modules which are not supported by Proxmox VE 
+
+# nidiafb see bugreport https://bugzilla.proxmox.com/show_bug.cgi?id=701
+blacklist nvidiafb