Skip to content

Commit 392ea50

Browse files
committed
[update] : Use find and xargs to copy initcpio files
1 parent 250c428 commit 392ea50

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

build.sh

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -680,8 +680,7 @@ make_customize_airootfs() {
680680
# Create script
681681
for _script in ${_script_list[@]}; do
682682
if [[ -f "${_script}" ]]; then
683-
echo -e "\n" >> "${airootfs_dir}/${_main_script}"
684-
cat "${_script}" >> "${airootfs_dir}/${_main_script}"
683+
echo -e "\n$(cat "${_script}")" >> "${airootfs_dir}/${_main_script}"
685684
remove "${_script}"
686685
else
687686
msg_debug "${_script} was not found."
@@ -700,12 +699,16 @@ make_customize_airootfs() {
700699
# Copy mkinitcpio archiso hooks and build initramfs (airootfs)
701700
make_setup_mkinitcpio() {
702701
local _hook
703-
mkdir -p "${airootfs_dir}/etc/initcpio/hooks"
704-
mkdir -p "${airootfs_dir}/etc/initcpio/install"
705-
for _hook in "archiso" "archiso_shutdown" "archiso_pxe_common" "archiso_pxe_nbd" "archiso_pxe_http" "archiso_pxe_nfs" "archiso_loop_mnt"; do
706-
cp "${script_path}/system/initcpio/hooks/${_hook}" "${airootfs_dir}/etc/initcpio/hooks"
707-
cp "${script_path}/system/initcpio/install/${_hook}" "${airootfs_dir}/etc/initcpio/install"
708-
done
702+
mkdir -p "${airootfs_dir}/etc/initcpio/hooks" "${airootfs_dir}/etc/initcpio/install"
703+
704+
find "${script_path}/system/initcpio/hooks/" -type f -printf0 2> /dev/null | xargs -I{} -0 cp "{}" "${airootfs_dir}/etc/initcpio/hooks"
705+
find "${script_path}/system/initcpio/install/" -type f -printf0 2> /dev/null | xargs -I{} -0 cp "{}" "${airootfs_dir}/etc/initcpio/install"
706+
707+
#for _hook in "archiso" "archiso_shutdown" "archiso_pxe_common" "archiso_pxe_nbd" "archiso_pxe_http" "archiso_pxe_nfs" "archiso_loop_mnt"; do
708+
# cp "${script_path}/system/initcpio/hooks/${_hook}" "${airootfs_dir}/etc/initcpio/hooks"
709+
# cp "${script_path}/system/initcpio/install/${_hook}" "${airootfs_dir}/etc/initcpio/install"
710+
#done
711+
709712
sed -i "s|/usr/lib/initcpio/|/etc/initcpio/|g" "${airootfs_dir}/etc/initcpio/install/archiso_shutdown"
710713
cp "${script_path}/system/initcpio/install/archiso_kms" "${airootfs_dir}/etc/initcpio/install"
711714
cp "${script_path}/system/initcpio/archiso_shutdown" "${airootfs_dir}/etc/initcpio"

0 commit comments

Comments
 (0)