almalinux/lorax
14
1
Fork 0
Code Issues Pull Requests Releases Activity

livemedia-creator: Use correct suffix on default image names (#1318958)

Browse Source 
When an image name hasn't been passed, and the compression type is
something other than xz, the default image name should use the user
specified compression suffix.

Resolves: rhbz#1318958
(cherry picked from commit f753a064b8)
This commit is contained in:
Brian C. Lane 2016-03-28 17:20:49 -07:00
parent 00185ad7c5
commit 96a10acec6
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/sbin/livemedia-creator
View File

@ -1041,6 +1041,19 @@ def make_live_images(opts, work_dir, root_dir, rootfs_image=None, size=None):
return work_dir return work_dir
def default_image_name(compression, basename):
""" Return a default image name with the correct suffix for the compression type.
:param str compression: Compression type
:param str basename: Base filename
:returns: basename with compression suffix
If the compression is unknown it defaults to xz
"""
SUFFIXES = {"xz": ".xz", "gzip": ".gz", "bzip2": ".bz2", "lzma": ".lzma"}
return basename + SUFFIXES.get(compression, ".xz")
def main(): def main():
parser = argparse.ArgumentParser(description="Create Live Install Media", parser = argparse.ArgumentParser(description="Create Live Install Media",
fromfile_prefix_chars="@") fromfile_prefix_chars="@")
@ -1332,17 +1345,17 @@ def main():
opts.fs_label = "AMI" opts.fs_label = "AMI"
elif opts.make_tar: elif opts.make_tar:
if not opts.image_name: if not opts.image_name:
opts.image_name = "root.tar.xz" opts.image_name = default_image_name(opts.compression, "root.tar")
if opts.compression == "xz" and not opts.compress_args: if opts.compression == "xz" and not opts.compress_args:
opts.compress_args = ["-9"] opts.compress_args = ["-9"]
elif opts.make_oci: elif opts.make_oci:
if not opts.image_name: if not opts.image_name:
opts.image_name = "bundle.tar.xz" opts.image_name = default_image_name(opts.compression, "bundle.tar")
if opts.compression == "xz" and not opts.compress_args: if opts.compression == "xz" and not opts.compress_args:
opts.compress_args = ["-9"] opts.compress_args = ["-9"]
elif opts.make_vagrant: elif opts.make_vagrant:
if not opts.image_name: if not opts.image_name:
opts.image_name = "vagrant.tar.xz" opts.image_name = default_image_name(opts.compression, "vagrant.tar")
if opts.compression == "xz" and not opts.compress_args: if opts.compression == "xz" and not opts.compress_args:
opts.compress_args = ["-9"] opts.compress_args = ["-9"]