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

macboot defaults to no on rhel7 (#1012529)

Browse Source 
The tools needed are not shipped with RHEL7 so default to no macboot.

Resolves: rhbz#1012529
This commit is contained in:
Brian C. Lane 2013-09-26 16:57:09 -07:00
parent ac202ee4ed
commit ed5803bae8
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pylorax/__init__.py
View File

@ -138,7 +138,7 @@ class Lorax(BaseLoraxClass):
def run(self, ybo, product, version, release, variant="", bugurl="",
isfinal=False, workdir=None, outputdir=None, buildarch=None, volid=None,
domacboot=True, doupgrade=True, remove_temp=False):
domacboot=False, doupgrade=True, remove_temp=False):
assert self._configured

2
src/pylorax/treebuilder.py
View File

@ -168,7 +168,7 @@ class RuntimeBuilder(object):
class TreeBuilder(object):
'''Builds the arch-specific boot images.
inroot should be the installtree root (the newly-built runtime dir)'''
def __init__(self, product, arch, inroot, outroot, runtime, isolabel, domacboot=True, doupgrade=True, templatedir=None):
def __init__(self, product, arch, inroot, outroot, runtime, isolabel, domacboot=False, doupgrade=True, templatedir=None):
# NOTE: if you pass an arg named "runtime" to a mako template it'll
# clobber some mako internal variables - hence "runtime_img".
self.vars = DataHolder(arch=arch, product=product, runtime_img=runtime,

4
src/sbin/livemedia-creator
View File

@ -772,9 +772,9 @@ if __name__ == '__main__':
help="Directory to copy the resulting images and iso into. "
"Defaults to the temporary working directory")
parser.add_argument( "--macboot", action="store_true", default=True,
parser.add_argument( "--macboot", action="store_true",
dest="domacboot")
parser.add_argument( "--nomacboot", action="store_false",
parser.add_argument( "--nomacboot", action="store_false", default=False,
dest="domacboot")
# Group of arguments for appliance creation

4
src/sbin/lorax
View File

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