From 8bccefe07dd51d7e2c36844a1ec07b4c462a22bd Mon Sep 17 00:00:00 2001 From: Lubomír Sedlář Date: May 31 2016 19:09:09 +0000 Subject: Change image naming for twoweek compose The release name now contains Atomic and having images name Atomic-Atomic is not nice. Also drop filename setting from ostree_installer. It uses the global naming format. Signed-off-by: Lubomír Sedlář --- diff --git a/fedora-atomic.conf b/fedora-atomic.conf index 2919b45..765faa8 100644 --- a/fedora-atomic.conf +++ b/fedora-atomic.conf @@ -70,7 +70,7 @@ createrepo_checksum = 'sha256' # CHECKSUMS media_checksums = ['sha256'] media_checksum_one_file = True -media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s-%(arch)s' +media_checksum_base_filename = 'Fedora-%(variant)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s-%(arch)s' #jigdo create_jigdo = False @@ -229,10 +229,10 @@ createiso_skip = [ #] # Image name respecting Fedora's image naming policy -image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s.iso' +image_name_format = 'Fedora-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s.iso' # # Use the same format for volume id image_volid_formats = [ - '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s' + 'Fedora-%(variant)s-%(disc_type)s-%(arch)s-%(version)s' ] # No special handling for layered products, use same format as for regular images image_volid_layered_product_formats = [] @@ -367,7 +367,6 @@ ostree_installer = [ "x86_64": { "source_repo_from": "http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/23/Everything/$arch/os/", "release": None, - "filename": "%(release_short)s-%(variant)s-%(arch)s-%(version)s-%(date)s.iso", "installpkgs": ["fedora-productimg-atomic"], "add_template": ["atomic-installer/lorax-configure-repo.tmpl"], "add_template_var": [