Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/configs/releng
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2020-07-17 12:10:35 +0300
committernl6720 <nl6720@gmail.com>2020-07-28 11:56:58 +0300
commit78fe6560420adccf70c50eb9963e133794f7522e (patch)
tree3a2a598042cf77affb88ae1171407daa05ef6e59 /configs/releng
parentdf93289b73c87f290a884ea6fa955a49cc0f8a9d (diff)
Deprecate customize_airootfs.sh
Show a deprecation notice if airootfs/root/customize_airootfs.sh is found.
Diffstat (limited to 'configs/releng')
-rwxr-xr-xconfigs/releng/airootfs/root/customize_airootfs.sh2
-rwxr-xr-xconfigs/releng/build.sh16
2 files changed, 11 insertions, 7 deletions
diff --git a/configs/releng/airootfs/root/customize_airootfs.sh b/configs/releng/airootfs/root/customize_airootfs.sh
index 5c98fd6..2d7f2e0 100755
--- a/configs/releng/airootfs/root/customize_airootfs.sh
+++ b/configs/releng/airootfs/root/customize_airootfs.sh
@@ -2,6 +2,8 @@
set -e -u
+echo 'Warning: customize_airootfs.sh is deprecated! Support for it will be removed in a future archiso version.'
+
sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen
locale-gen
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/