diff --git a/bin/buildiso.in b/bin/buildiso.in index 54d95e5..aedeb66 100755 --- a/bin/buildiso.in +++ b/bin/buildiso.in @@ -21,6 +21,7 @@ import ${LIBDIR}/util.sh show_profile(){ prepare_profile "$1" msg2 "iso_file: %s" "${iso_file}" + msg2 "iso_label: %s" "${iso_label}" if ${verbose}; then msg2 "autologin: %s" "${autologin}" msg2 "nonfree_mhwd: %s" "${nonfree_mhwd}" @@ -84,7 +85,6 @@ display_settings(){ msg2 "dist_codename: %s" "${dist_codename}" msg "ISO INFO:" - msg2 "iso_label: %s" "${iso_label}" msg2 "iso_compression: %s" "${iso_compression}" msg "BUILD QUEUE:" diff --git a/lib/util-iso.sh b/lib/util-iso.sh index 3395412..7369376 100644 --- a/lib/util-iso.sh +++ b/lib/util-iso.sh @@ -612,6 +612,8 @@ load_profile(){ iso_file=$(gen_iso_fn).iso + iso_label=$(get_iso_label "${dist_branding}_${dist_release//.}_${profile}") + mkchroot_args+=(-C ${pacman_conf} -S ${mirrors_conf} -B "${build_mirror}/${target_branch}" -K) work_dir=${chroots_iso}/${profile}/${target_arch} diff --git a/lib/util.sh b/lib/util.sh index 3360712..4463a24 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -313,8 +313,6 @@ init_buildiso(){ [[ -z ${iso_compression} ]] && iso_compression='zstd' - iso_label=$(get_iso_label "${dist_branding}${dist_release//.}") - [[ -z ${kernel} ]] && kernel="linux54" load_run_dir "${profile_repo}"