Merge branch 'master' of ssh://git.planet-lab.org/git/pyplnet

[pyplnet.git] / modprobe.py

diff --git a/modprobe.py b/modprobe.py
index e13a658..da1dcaf 100644 (file)
--- a/modprobe.py
+++ b/modprobe.py
@@ -171,7 +171,7 @@ if __name__ == '__main__':
     m.input()
 
     blacklist = Modprobe()
-    blacklistfiles = ("blacklist","blacklist-compat","blacklist-firewire")
+    blacklistfiles = os.listdir("/etc/modprobe.d")
     for blf in blacklistfiles:
         if os.path.exists("/etc/modprobe.d/%s"%blf):
             blacklist.input("/etc/modprobe.d/%s"%blf)