Commit 268f1dac authored by Philip Müller's avatar Philip Müller

[util] volid: move 'iso_label' to profile section

parent 5a6ad3f6
...@@ -21,6 +21,7 @@ import ${LIBDIR}/util.sh ...@@ -21,6 +21,7 @@ import ${LIBDIR}/util.sh
show_profile(){ show_profile(){
prepare_profile "$1" prepare_profile "$1"
msg2 "iso_file: %s" "${iso_file}" msg2 "iso_file: %s" "${iso_file}"
msg2 "iso_label: %s" "${iso_label}"
if ${verbose}; then if ${verbose}; then
msg2 "autologin: %s" "${autologin}" msg2 "autologin: %s" "${autologin}"
msg2 "nonfree_mhwd: %s" "${nonfree_mhwd}" msg2 "nonfree_mhwd: %s" "${nonfree_mhwd}"
...@@ -84,7 +85,6 @@ display_settings(){ ...@@ -84,7 +85,6 @@ display_settings(){
msg2 "dist_codename: %s" "${dist_codename}" msg2 "dist_codename: %s" "${dist_codename}"
msg "ISO INFO:" msg "ISO INFO:"
msg2 "iso_label: %s" "${iso_label}"
msg2 "iso_compression: %s" "${iso_compression}" msg2 "iso_compression: %s" "${iso_compression}"
msg "BUILD QUEUE:" msg "BUILD QUEUE:"
......
...@@ -612,6 +612,8 @@ load_profile(){ ...@@ -612,6 +612,8 @@ load_profile(){
iso_file=$(gen_iso_fn).iso 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) mkchroot_args+=(-C ${pacman_conf} -S ${mirrors_conf} -B "${build_mirror}/${target_branch}" -K)
work_dir=${chroots_iso}/${profile}/${target_arch} work_dir=${chroots_iso}/${profile}/${target_arch}
......
...@@ -313,8 +313,6 @@ init_buildiso(){ ...@@ -313,8 +313,6 @@ init_buildiso(){
[[ -z ${iso_compression} ]] && iso_compression='zstd' [[ -z ${iso_compression} ]] && iso_compression='zstd'
iso_label=$(get_iso_label "${dist_branding}${dist_release//.}")
[[ -z ${kernel} ]] && kernel="linux54" [[ -z ${kernel} ]] && kernel="linux54"
load_run_dir "${profile_repo}" load_run_dir "${profile_repo}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment