almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

lorax: Add --sharedir to override configuration path

Browse Source 
One of the most useful things to override is the path to the templates,
this adds a cmdline option to do that instead of needing to create a
whole configuration file and pass it.
This commit is contained in:
Brian C. Lane 2015-10-28 17:56:23 -07:00
parent 53d94f1e9b
commit 77a7eb266d
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sbin/lorax
View File

@ -116,6 +116,8 @@ def main(args):
default=[]) default=[])
optional.add_argument("--noverify", action="store_false", default=True, dest="verify", optional.add_argument("--noverify", action="store_false", default=True, dest="verify",
help="Do not verify the install root") help="Do not verify the install root")
optional.add_argument("--sharedir", metavar="SHAREDIR", type=os.path.abspath,
help="Directory containing all the templates. Overrides config file sharedir")
# add the show version option # add the show version option
parser.add_argument("-V", help="show program's version number and exit", parser.add_argument("-V", help="show program's version number and exit",
@ -146,6 +148,8 @@ def main(args):
opts.cachedir = os.path.abspath(opts.cachedir) opts.cachedir = os.path.abspath(opts.cachedir)
if opts.workdir: if opts.workdir:
opts.workdir = os.path.abspath(opts.workdir) opts.workdir = os.path.abspath(opts.workdir)
if opts.sharedir and not os.path.isdir(opts.sharedir):
parser.error("sharedir %s doesn't exist." % opts.sharedir)
setup_logging(opts) setup_logging(opts)
@ -193,6 +197,11 @@ def main(args):
lorax = pylorax.Lorax() lorax = pylorax.Lorax()
lorax.configure(conf_file=opts.config) lorax.configure(conf_file=opts.config)
lorax.conf.set("lorax", "logdir", os.path.dirname(opts.logfile)) lorax.conf.set("lorax", "logdir", os.path.dirname(opts.logfile))
# Override the config file's template sharedir
if opts.sharedir:
lorax.conf.set("lorax", "sharedir", opts.sharedir)
lorax.run(dnfbase, opts.product, opts.version, opts.release, lorax.run(dnfbase, opts.product, opts.version, opts.release,
opts.variant, opts.bugurl, opts.isfinal, opts.variant, opts.bugurl, opts.isfinal,
workdir=tempdir, outputdir=outputdir, buildarch=opts.buildarch, workdir=tempdir, outputdir=outputdir, buildarch=opts.buildarch,