From 458be78366e0f26c16efbdf333fadd6a25150f11 Mon Sep 17 00:00:00 2001 From: parazyd Date: Tue, 28 Aug 2018 13:08:15 +0200 Subject: [PATCH] Add a configuration option to toggle compressing the final image. --- config | 1 + zlibs/imaging | 21 +++++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/config b/config index 685403b..43ccb4b 100644 --- a/config +++ b/config @@ -23,6 +23,7 @@ vars+=(release version mirror section blend_name image_name vm_name) vars+=(arch earch) vars+=(aptcachedir APT_CACHE aptcachegpg) vars+=(usercredentials rootcredentials) +vars+=(nocompressimage) arrs+=(core_packages base_packages purge_packages blend_packages) diff --git a/zlibs/imaging b/zlibs/imaging index cf63f91..22e871e 100644 --- a/zlibs/imaging +++ b/zlibs/imaging @@ -170,17 +170,26 @@ image_pack_dist() { zerr } - notice "compressing image with xz" - silly + if [[ -n "$nocompressimage" ]]; then + _suffix="img" + else + _suffix="img.xz" + fi + pushd $workdir - xz -zv "${image_name}.img" + + [[ -n "$nocompressimage" ]] || { + notice "compressing image with xz" + silly + xz -zv "${image_name}.img" + } mkdir -p "$R/dist" - mv -v ${image_name}.img.xz $R/dist/ + mv -v ${image_name}.${_suffix} $R/dist/ pushd "$R/dist" - notice "generating sha256 for ${image_name}.img.xz" - sha256sum ${image_name}.img.xz > ${image_name}.img.xz.sha + notice "generating sha256 for ${image_name}.${_suffix}" + sha256sum ${image_name}.${_suffix} > ${image_name}.${_suffix}.sha notice "generating sha256 for ${image_name}.tar.gz" sha256sum ${image_name}.tar.gz > ${image_name}.tar.gz.sha popd