From 78fe6560420adccf70c50eb9963e133794f7522e Mon Sep 17 00:00:00 2001 From: nl6720 Date: Fri, 17 Jul 2020 12:10:35 +0300 Subject: Deprecate customize_airootfs.sh Show a deprecation notice if airootfs/root/customize_airootfs.sh is found. --- configs/releng/build.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'configs/releng/build.sh') diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 23cae8d..07d2560 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -117,14 +117,16 @@ make_setup_mkinitcpio() { # Customize installation (airootfs) make_customize_airootfs() { - if [ -n "${verbose}" ]; then - mkarchiso -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \ - -r '/root/customize_airootfs.sh' run - else - mkarchiso -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \ - -r '/root/customize_airootfs.sh' run + if [[ -e "${work_dir}/x86_64/airootfs/root/customize_airootfs.sh" ]]; then + if [ -n "${verbose}" ]; then + mkarchiso -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \ + -r '/root/customize_airootfs.sh' run + else + mkarchiso -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \ + -r '/root/customize_airootfs.sh' run + fi + rm "${work_dir}/x86_64/airootfs/root/customize_airootfs.sh" fi - rm "${work_dir}/x86_64/airootfs/root/customize_airootfs.sh" } # Prepare kernel/initramfs ${install_dir}/boot/ -- cgit v1.2.3-70-g09d2