From e567a2ab268e340be608ac442eb13c54c566fbff Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Thu, 2 May 2024 10:51:08 +0300
Subject: mkarchiso: do not place the pkglist.x86_64.txt file inside the
 bootstrap tarball's root.x86_64 directory

Keep it inside the archive, but separate from the `root.x86_64` directory
to avoid polluting it.
---
 archiso/mkarchiso | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 98bc248..cd00c9d 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -33,6 +33,7 @@ arch=""
 pacman_conf=""
 packages=""
 bootstrap_packages=""
+bootstrap_parent=""
 pacstrap_dir=""
 search_filename=""
 declare -i rm_work_dir=0
@@ -1702,16 +1703,13 @@ _build_bootstrap_image() {
         *) _msg_error 'Unsupported compression!' 1 ;;
     esac
 
-    local _bootstrap_parent
-    _bootstrap_parent="$(dirname -- "${pacstrap_dir}")"
-
     [[ -d "${out_dir}" ]] || install -d -- "${out_dir}"
 
-    cd -- "${_bootstrap_parent}"
+    cd -- "${bootstrap_parent}"
 
     _msg_info "Creating bootstrap image..."
     rm -f -- "${out_dir:?}/${image_name:?}${tarball_ext}"
-    bsdtar -cf - "root.${arch}" | "${bootstrap_tarball_compression[@]}" >"${out_dir}/${image_name}${tarball_ext}"
+    bsdtar -cf - "root.${arch}" "pkglist.${arch}.txt" | "${bootstrap_tarball_compression[@]}" >"${out_dir}/${image_name}${tarball_ext}"
     _msg_info "Done!"
     du -h -- "${out_dir}/${image_name}${tarball_ext}"
     cd -- "${OLDPWD}"
@@ -1961,7 +1959,7 @@ _make_pkglist() {
     _msg_info "Creating a list of installed packages on live-enviroment..."
     case "${buildmode}" in
         "bootstrap")
-            pacman -Q --sysroot "${pacstrap_dir}" >"${pacstrap_dir}/pkglist.${arch}.txt"
+            pacman -Q --sysroot "${pacstrap_dir}" >"${bootstrap_parent}/pkglist.${arch}.txt"
             ;;
         "iso"|"netboot")
             install -d -m 0755 -- "${isofs_dir}/${install_dir}"
@@ -2024,6 +2022,7 @@ _build_buildmode_bootstrap() {
 
     # Set up essential directory paths
     pacstrap_dir="${work_dir}/${arch}/bootstrap/root.${arch}"
+    bootstrap_parent="$(dirname -- "${pacstrap_dir}")"
     [[ -d "${work_dir}" ]] || install -d -- "${work_dir}"
     install -d -m 0755 -o 0 -g 0 -- "${pacstrap_dir}"
 
-- 
cgit v1.2.3-70-g09d2