From 34657e4c32665b62e30dd682798463b074c4f9df Mon Sep 17 00:00:00 2001 From: hayao Date: Mon, 24 Aug 2020 14:36:10 +0900 Subject: [PATCH] [update] : Added include_info --- build.sh | 26 ++++++++++++++------------ default.conf | 7 ++++++- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/build.sh b/build.sh index 7242d067..8c69eb6d 100755 --- a/build.sh +++ b/build.sh @@ -1243,19 +1243,21 @@ make_prepare() { fi # iso version info - local _write_info_file _info_file="${work_dir}/iso/alteriso-info" - _write_info_file () { - echo "${@}" >> "${_info_file}" - } - rm -rf "${_info_file}"; touch "${_info_file}" - if [[ -d "${script_path}/.git" ]]; then - _write_info_file "${iso_application} ${arch} ${iso_version}-$(git rev-parse --short HEAD)" - else - _write_info_file "${iso_application} ${arch} ${iso_version}" + if [[ "${include_info}" = true ]]; then + local _write_info_file _info_file="${work_dir}/iso/alteriso-info" + _write_info_file () { + echo "${@}" >> "${_info_file}" + } + rm -rf "${_info_file}"; touch "${_info_file}" + if [[ -d "${script_path}/.git" ]]; then + _write_info_file "${iso_application} ${arch} ${iso_version}-$(git rev-parse --short HEAD)" + else + _write_info_file "${iso_application} ${arch} ${iso_version}" + fi + _write_info_file "Created by ${iso_publisher}" + _write_info_file "Live user name: ${username}" + _write_info_file "Live user pass: ${password}" fi - _write_info_file "Created by ${iso_publisher}" - _write_info_file "Live user name: ${username}" - _write_info_file "Live user pass: ${password}" } # Build ISO diff --git a/default.conf b/default.conf index f370328a..f846a6e1 100644 --- a/default.conf +++ b/default.conf @@ -108,6 +108,11 @@ sfs_comp="zstd" sfs_comp_opt="" +# If set to true, include alteriso_info in iso root. +# This setting cannot be changed by an argument. +include_info=true + + #-- kernel config --# # Set the kernel that live session use. @@ -170,7 +175,7 @@ noconfirm=false # Use mkalteriso written in a traditional shell script # instead of the C ++ version of mkalteriso. # Change the default behavior of "--shmkalteriso". -shmkalteriso="false" +shmkalteriso=false # When set to true, colored output will not be performed. # Change the default behavior of "--nocolor". -- 2.11.0