From c69aa1b29cf0e2900681bbd892df2a260f0d491e Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Thu, 4 Dec 2008 21:01:37 +0000 Subject: [PATCH] Don't whine about comments in modprobe.conf. Allow users to specify the program to put in the comment. --- modprobe.py | 4 ++-- plnet.py | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/modprobe.py b/modprobe.py index 638ebfa..da311ff 100644 --- a/modprobe.py +++ b/modprobe.py @@ -11,7 +11,7 @@ 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 @@ -24,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": diff --git a/plnet.py b/plnet.py index 272fa00..c012067 100755 --- a/plnet.py +++ b/plnet.py @@ -9,7 +9,7 @@ import tempfile import sioc import modprobe -def InitInterfaces(logger, plc, data, root="", files_only=False): +def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeManager"): sysconfig = "%s/etc/sysconfig/network-scripts" % root # query running network interfaces @@ -126,7 +126,10 @@ def InitInterfaces(logger, plc, data, root="", files_only=False): interfaces[ifname] = inter m = modprobe.Modprobe() - m.input("%s/etc/modprobe.conf" % root) + try: + m.input("%s/etc/modprobe.conf" % root, program) + except: + pass for (dev, inter) in interfaces.iteritems(): # get the driver string "moduleName option1=a option2=b" driver=inter.get('DRIVER','') @@ -286,16 +289,18 @@ if __name__ == "__main__": import optparse import sys - parser = optparse.OptionParser() + parser = optparse.OptionParser(usage="plnet [-v] [-f] [-p ] -r root node_id") parser.add_option("-v", "--verbose", action="store_true", dest="verbose") parser.add_option("-r", "--root", action="store", type="string", dest="root", default=None) parser.add_option("-f", "--files-only", action="store_true", dest="files_only") + parser.add_option("-p", "--program", action="store", type="string", + dest="program", default="plnet") (options, args) = parser.parse_args() if len(args) != 1 or options.root is None: - print >>sys.stderr, \ - "Usage: %s [-v] [-f] -r node_id" % sys.argv[0] + print >>sys.stderr, "Missing root or node_id" + parser.print_help() sys.exit(1) node = shell.GetNodes({'node_id': [int(args[0])]}) -- 2.43.0