From 91cc5ec7ac7420aa0082ad6da8effc1dd5e156df Mon Sep 17 00:00:00 2001
From: Anders Blomdell <anders.blomdell@control.lth.se>
Date: Thu, 21 Sep 2017 18:10:33 +0200
Subject: [PATCH] Changed ksinfo option to saner name
---
src/hostinfo.py | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/hostinfo.py b/src/hostinfo.py
index e0d2553..e79a37b 100755
--- a/src/hostinfo.py
+++ b/src/hostinfo.py
@@ -246,6 +246,9 @@ if __name__ == '__main__':
optParser.add_argument("--kickstart",
action="store", metavar="PREFIX",
help="kickstart file PREFIX")
+ optParser.add_argument("--kickstart_info",
+ action="store", metavar="FILE",
+ help="save kickstart info in FILE")
optParser.add_argument("--macosx_auto",
action="store", metavar="DIR",
help="Generate MacOSX autmount maps")
@@ -264,9 +267,6 @@ if __name__ == '__main__':
optParser.add_argument("--pretty",
action="store_true", default=False,
help="pretty-print XML tree")
- optParser.add_argument("--pxelinux",
- action="store", metavar="DIR",
- help="symlink DIR/<ethernet> to <kickstart>")
optParser.add_argument("--role",
default=[],
action="append", metavar="ROLE",
@@ -319,6 +319,13 @@ if __name__ == '__main__':
for (f, c) in hostinfo.ifconfig.generate(tree, host):
file["%s/%s" % (options.ifconfig, f)] = c
+ if options.kickstart_info:
+ ksinfo = ""
+ for (mac, host, ksfile) in hostinfo.pxelinux.generate(tree, host):
+ ksinfo += "%s %s %s\n" % (mac, host, ksfile)
+ # symlink["%s/%s" % (options.pxelinux, mac)] = ksfile
+ file[options.kickstart_info] = ksinfo
+
if options.macosx_auto:
for (f, c) in hostinfo.macosx_auto.generate(tree):
file["%s/%s" % (options.macosx_auto, f)] = c
@@ -334,13 +341,6 @@ if __name__ == '__main__':
if options.netgroup:
file[options.netgroup] = hostinfo.yp.netgroup(tree)
- if options.pxelinux:
- ksinfo = ""
- for (mac, host, ksfile) in hostinfo.pxelinux.generate(tree, host):
- ksinfo += "%s %s %s\n" % (mac, host, ksfile)
- # symlink["%s/%s" % (options.pxelinux, mac)] = ksfile
- file["%s/ksinfo" % options.pxelinux] = ksinfo
-
if options.pretty:
result = "<?xml version='1.0' encoding='utf-8'?>\n\n"
result += tree._xml(attr_sort=attr_sort, tag_sort=tag_sort)
--
GitLab