[PATCH] Also prompt for and submit kickstart data for a machine

--- snake-machine | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/snake-machine b/snake-machine index f0eff8f..e000804 100755 --- a/snake-machine +++ b/snake-machine @@ -51,6 +51,7 @@ def print_info(t): ["Arch", " ".join(t.arch)], ["Fingerprints", " ".join(t.fingerprints)], ["Kernel Args", t.bootargs], + ["Kickstart", t.ksdata], ]: print "%-12s : %s" % (k,v) print "" @@ -88,6 +89,13 @@ def setup_option_parser(cmd=None): else: parser = optparse.OptionParser(usage="snake-machine [options] %s [%s-options]" % (cmd,cmd)) + def check_ksdata (option, opt_str, value, parser): + if os.path.isfile(value): + fd = open(value, 'r') + value = fd.read() + fd.close() + setattr(parser.values, option.dest, value) + parser.add_option("-n", "--nickname", action="store", dest="nickname", default=None, help="Nickname of the machine (defaults to %default)") @@ -100,6 +108,9 @@ def setup_option_parser(cmd=None): parser.add_option("-b", "--bootargs", action="store", dest="bootargs", default=None, help="Kernel boot arguments required to install this system") + parser.add_option("-k", "--ksdata", + action="callback", dest="ksdata", type="string", callback=check_ksdata, + help="Kickstart commands required to install this system (string or filename allowed)") elif cmd is None: parser=optparse.OptionParser(usage="snake-machine [options] < %s >" % (", ".join(client_commands))) @@ -193,6 +204,7 @@ def main(argv): hwinfo["arch"] = copt.arch or [rpmUtils.arch.getBaseArch()] hwinfo["fingerprints"] = copt.fingerprints or snake.machineinfo.get_fingerprints() hwinfo["bootargs"] = copt.bootargs or "" + hwinfo["ksdata"] = copt.ksdata or "" log.debug("Adding '%s'" % (hwinfo["nickname"],)) @@ -220,7 +232,7 @@ def main(argv): hwinfo = dict() hwinfo["id"] = id # only initialize a value if user provided on the cmdline (e.g. no default values) - for key in ["nickname", "arch", "fingerprints", "bootargs"]: + for key in ["nickname", "arch", "fingerprints", "bootargs", "ksdata"]: if getattr(copt, key) is not None: hwinfo[key] = getattr(copt, key) -- 1.5.4.5