Don't whine about comments in modprobe.conf.

[pyplnet.git] / modprobe.py

diff --git a/modprobe.py b/modprobe.py
index d7fa2e3..da311ff 100644 (file)
--- a/modprobe.py
+++ b/modprobe.py
@@ -5,12 +5,13 @@
 """Modprobe is a utility to read/modify/write /etc/modprobe.conf"""
 
 import os
+import tempfile
 
 class Modprobe():
     def __init__(self,filename="/etc/modprobe.conf"):
         self.conffile = {}
         self.origconffile = {}
-        for keyword in ("alias","options","install","remove","blacklist","MODULES"):
+        for keyword in ("alias","options","install","remove","blacklist","MODULES","#"):
             self.conffile[keyword]={}
         self.filename = filename
 
@@ -23,7 +24,7 @@ class Modprobe():
 
             table = self.conffile.get(command,None)
             if table == None:
-                print "WARNING: command %s not recognize. Ignoring!" % command
+                print "WARNING: command %s not recognized. Ignoring!" % command
                 continue
 
             if command == "alias":
@@ -80,8 +81,8 @@ class Modprobe():
             return False
 
     def output(self,filename="/etc/modprobe.conf",program="NodeManager"):
-        tmpnam = os.tmpnam()
-        fb = file(tmpnam,"w")
+        (fd, tmpnam) = tempfile.mkstemp(dir=os.path.dirname(filename))
+        fb = os.fdopen(fd, "w")
         fb.write("# Written out by %s\n" % program)
 
         for command in ("alias","options","install","remove","blacklist"):