OSDN Git Service

[fix] : optimize_for_tarball.sh
authorhayao <shun819.mail@gmail.com>
Sat, 22 Aug 2020 05:55:50 +0000 (14:55 +0900)
committerhayao <shun819.mail@gmail.com>
Sat, 22 Aug 2020 05:55:50 +0000 (14:55 +0900)
build.sh

index 35a6688..b8cb0da 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -1209,11 +1209,19 @@ make_tarball() {
 
     if [[ -f "${work_dir}/${arch}/airootfs/root/optimize_for_tarball.sh" ]]; then
         chmod 755 "${work_dir}/${arch}/airootfs/root/optimize_for_tarball.sh"
+        # Execute optimize_for_tarball.sh.
+        ${mkalteriso} ${mkalteriso_option} \
+        -w "${work_dir}/${arch}" \
+        -C "${work_dir}/pacman-${arch}.conf" \
+        -D "${install_dir}" \
+        -r "/root/optimize_for_tarball.sh" \
+        run
     fi
 
-    arch-chroot "${work_dir}/airootfs" "/root/optimize_for_tarball.sh" -u ${username}
     ARCHISO_GNUPG_FD=${gpg_key:+17} ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" -r "mkinitcpio -p ${kernel_mkinitcpio_profile}" run
 
+    remove "${work_dir}/${arch}/airootfs/root/optimize_for_tarball.sh"
+
     ${mkalteriso} ${mkalteriso_option} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" -A "${iso_application}" -o "${out_dir}" tarball "$(echo ${iso_filename} | sed 's/\.[^\.]*$//').tar.xz"
 
     remove "${work_dir}/airootfs"