From 8f994ef0d2d4f528ca8aa0d904c65aee55ccc907 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Sun, 9 Feb 2020 00:02:07 +0100
Subject: [PATCH 1/5] [util] extend volid to 32 characters

---
 lib/util.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/util.sh b/lib/util.sh
index 73d1bfc..58145f6 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -246,8 +246,8 @@ get_iso_label(){
     local label="$1"
     label="${label//_}"	# relace all _
     label="${label//-}"	# relace all -
-    label="${label^^}"	# all uppercase
-    label="${label::8}"	# limit to 8 characters
+    label="${label^^}"		# all uppercase
+    label="${label::32}"	# limit to 32 characters
     echo ${label}
 }
 

From 5a6ad3f64bc5c39cba5168f4b4282d52e31d78cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Sun, 9 Feb 2020 00:03:31 +0100
Subject: [PATCH 2/5] [util] volid: change default branding to MANJARO

---
 lib/util.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util.sh b/lib/util.sh
index 58145f6..3360712 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -309,7 +309,7 @@ init_buildiso(){
 
     iso_name=$(get_osid)
 
-    [[ -z ${dist_branding} ]] && dist_branding="MJRO"
+    [[ -z ${dist_branding} ]] && dist_branding="MANJARO"
 
     [[ -z ${iso_compression} ]] && iso_compression='zstd'
 

From 268f1dac17817f635a62b75ba1e846e9179778cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Sun, 9 Feb 2020 00:08:08 +0100
Subject: [PATCH 3/5] [util] volid: move 'iso_label' to profile section

---
 bin/buildiso.in | 2 +-
 lib/util-iso.sh | 2 ++
 lib/util.sh     | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

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}"

From ea3a53e9d80b063aec4ffe782b030a24b2c3065c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Sun, 9 Feb 2020 00:18:45 +0100
Subject: [PATCH 4/5] [util] volid: don't replace '_'

---
 lib/util.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util.sh b/lib/util.sh
index 4463a24..250c30f 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -244,7 +244,7 @@ init_buildpkg(){
 
 get_iso_label(){
     local label="$1"
-    label="${label//_}"	# relace all _
+    #label="${label//_}"	# relace all _
     label="${label//-}"	# relace all -
     label="${label^^}"		# all uppercase
     label="${label::32}"	# limit to 32 characters

From 2c234febb8aebc3763a28db55742509f18cc3225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Sun, 9 Feb 2020 11:28:35 +0100
Subject: [PATCH 5/5] [util-iso] volid: change order of iso_label

---
 lib/util-iso.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index 7369376..1465c70 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -612,7 +612,7 @@ load_profile(){
 
     iso_file=$(gen_iso_fn).iso
 
-    iso_label=$(get_iso_label "${dist_branding}_${dist_release//.}_${profile}")
+    iso_label=$(get_iso_label "${dist_branding}_${profile}_${dist_release//.}")
 
     mkchroot_args+=(-C ${pacman_conf} -S ${mirrors_conf} -B "${build_mirror}/${target_branch}" -K)
     work_dir=${chroots_iso}/${profile}/${target_arch}