From 58f2f96f1d69bdcc9e7f8be4715b54118d89ae37 Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Fri, 17 Nov 2017 12:11:20 -0500
Subject: refactor chroot customization script

---
 configs/profile/build.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'configs/profile/build.sh')

diff --git a/configs/profile/build.sh b/configs/profile/build.sh
index 85cc5b5..08d8901 100755
--- a/configs/profile/build.sh
+++ b/configs/profile/build.sh
@@ -23,7 +23,6 @@ target=''
 verbose=''
 efi_img_kbytes=40000
 pacman_conf=${work_dir}/pacman.conf
-chroot_customization_script=/root/customize_root_image.sh
 
 # environment
 data_dir=/usr/share/parabolaiso/data
@@ -169,17 +168,18 @@ make_customize_root_image() {
     cp -af ${releng_dir}/root-image ${work_dir}/${arch}
 
     echo "Customizing root image"
-    arch="${arch}"                                                                 \
-    iso_title="${iso_title}"                                                       \
-    iso_init="${iso_init}"                                                         \
-    iso_gui="${iso_gui}"                                                           \
-    enable_offline_install="${enable_offline_install}"                             \
-    setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch}                \
-                                             -C ${pacman_conf}                     \
-                                             -D ${iso_dirname}                     \
-                                             ${offline}                            \
-                                             -r ${chroot_customization_script} run
-    rm ${work_dir}/${arch}/root-image${chroot_customization_script}
+    arch="${arch}"                                                            \
+    iso_title="${iso_title}"                                                  \
+    iso_init="${iso_init}"                                                    \
+    iso_gui="${iso_gui}"                                                      \
+    enable_offline_install="${enable_offline_install}"                        \
+    setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch}           \
+                                             -C ${pacman_conf}                \
+                                             -D ${iso_dirname}                \
+                                             ${offline}                       \
+                                             -r /root/customize_root_image.sh \
+                                             run
+    rm ${work_dir}/${arch}/root-image/root/customize_root_image*
 }
 
 # Prepare kernel/initramfs ${iso_dirname}/boot/
-- 
cgit v1.2.2