[Lorax master/rhel7 1/2] Add macboot option (#1012529)
Vratislav Podzimek
vpodzime at redhat.com
Fri Sep 27 12:41:00 UTC 2013
On Thu, 2013-09-26 at 17:58 -0700, Brian C. Lane wrote:
> From: "Brian C. Lane" <bcl at redhat.com>
>
> Add a macboot option to lorax and both macboot and nomacboot to lmc.
>
> Related: rhbz#1012529
> ---
> src/sbin/livemedia-creator | 7 ++++++-
> src/sbin/lorax | 4 +++-
> 2 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator
> index a0a994b..c2996c9 100755
> --- a/src/sbin/livemedia-creator
> +++ b/src/sbin/livemedia-creator
> @@ -521,7 +521,7 @@ def make_livecd(opts, mount_dir, work_dir):
> isolabel = isolabel[:32]
> 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,
> runtime=RUNTIME, isolabel=isolabel,
> templatedir=joinpaths(opts.lorax_templates,"live/"))
> @@ -772,6 +772,11 @@ 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,
> + dest="domacboot")
> + parser.add_argument( "--nomacboot", action="store_false",
> + dest="domacboot")
> +
> # Group of arguments for appliance creation
> app_group = parser.add_argument_group("appliance arguments")
> app_group.add_argument( "--app-name", default=None,
> diff --git a/src/sbin/lorax b/src/sbin/lorax
> index a571c0b..b137f48 100755
> --- a/src/sbin/lorax
> +++ b/src/sbin/lorax
> @@ -123,8 +123,10 @@ def main(args):
> help="build architecture", metavar="STRING")
> optional.add_option("--volid", default=None,
> help="volume id", metavar="STRING")
> + optional.add_option("--macboot", help="",
> + action="store_true", default=True, dest="domacboot")
> optional.add_option("--nomacboot", help="",
> - action="store_false", default=True, dest="domacboot")
> + action="store_false", dest="domacboot")
> optional.add_option("--noupgrade", help="",
> action="store_false", default=True, dest="doupgrade")
> optional.add_option("--logfile", default="./lorax.log",
These both look good to me.
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic
More information about the anaconda-patches
mailing list