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

Add macboot option (#1012529)

Browse Source 
Add a macboot option to lorax and both macboot and nomacboot to lmc.

Related: rhbz#1012529
This commit is contained in:
Brian C. Lane 2013-09-26 16:47:05 -07:00
parent 6eb04c63cb
commit ac202ee4ed
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sbin/livemedia-creator
View File

@ -521,7 +521,7 @@ def make_livecd(opts, mount_dir, work_dir):
isolabel = isolabel[:32] isolabel = isolabel[:32]
log.warn("Truncating isolabel to 32 chars: %s" % (isolabel,)) log.warn("Truncating isolabel to 32 chars: %s" % (isolabel,))
tb = TreeBuilder(product=product, arch=arch, tb = TreeBuilder(product=product, arch=arch, domacboot=opts.domacboot,
inroot=mount_dir, outroot=work_dir, inroot=mount_dir, outroot=work_dir,
runtime=RUNTIME, isolabel=isolabel, runtime=RUNTIME, isolabel=isolabel,
templatedir=joinpaths(opts.lorax_templates,"live/")) templatedir=joinpaths(opts.lorax_templates,"live/"))
@ -772,6 +772,11 @@ if __name__ == '__main__':
help="Directory to copy the resulting images and iso into. " help="Directory to copy the resulting images and iso into. "
"Defaults to the temporary working directory") "Defaults to the temporary working directory")
parser.add_argument( "--macboot", action="store_true", default=True,
dest="domacboot")
parser.add_argument( "--nomacboot", action="store_false",
dest="domacboot")
# Group of arguments for appliance creation # Group of arguments for appliance creation
app_group = parser.add_argument_group("appliance arguments") app_group = parser.add_argument_group("appliance arguments")
app_group.add_argument( "--app-name", default=None, app_group.add_argument( "--app-name", default=None,

4
src/sbin/lorax
View File

@ -123,8 +123,10 @@ def main(args):
help="build architecture", metavar="STRING") help="build architecture", metavar="STRING")
optional.add_option("--volid", default=None, optional.add_option("--volid", default=None,
help="volume id", metavar="STRING") help="volume id", metavar="STRING")
optional.add_option("--macboot", help="",
action="store_true", default=True, dest="domacboot")
optional.add_option("--nomacboot", help="", optional.add_option("--nomacboot", help="",
action="store_false", default=True, dest="domacboot") action="store_false", dest="domacboot")
optional.add_option("--noupgrade", help="", optional.add_option("--noupgrade", help="",
action="store_false", default=True, dest="doupgrade") action="store_false", default=True, dest="doupgrade")
optional.add_option("--logfile", default="./lorax.log", optional.add_option("--logfile", default="./lorax.log",