X-Git-Url: http://git.onelab.eu/?p=pyplnet.git;a=blobdiff_plain;f=modprobe.py;h=5e4053d14ec3cea35a39b81153d3e1e804b597f1;hp=04ca7d8ade55cc837c9f90e8618d610659254091;hb=e3abaaa6ae5dae5b401dd1bbb1e562002de173b9;hpb=423695e146b9355e67c593da66c7e51ee44c15f7

diff --git a/modprobe.py b/modprobe.py
index 04ca7d8..5e4053d 100644
--- a/modprobe.py
+++ b/modprobe.py
@@ -165,12 +165,19 @@ class Modprobe:
          
 if __name__ == '__main__':
     import sys
+    m = Modprobe()
     if len(sys.argv)>1:
-        m = Modprobe(sys.argv[1])
+        fn = sys.argv[1]
     else:
-        m = Modprobe()
+        fn = "/etc/modprobe.conf"
 
     m.input()
-    m.aliasset("bond0","bonding")
-    m.optionsset("bond0","miimon=100")
-    m.output("/tmp/x")
+
+    blacklist = Modprobe()
+    blacklistfiles = ("blacklist","blacklist-compat","blacklist-firewire")
+    for blf in blacklistfiles:
+        if os.path.exists("/etc/modprobe.d/%s"%blf):
+            blacklist.input("/etc/modprobe.d/%s"%blf)
+
+    m.output("/tmp/%s-tmp"%os.path.basename(fn),"TEST")
+    blacklist.output("/tmp/blacklist-tmp.txt","TEST")