Johannes/ISO
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deprecate customize_airootfs.sh

Browse Source 
Show a deprecation notice if airootfs/root/customize_airootfs.sh is found.
This commit is contained in:
nl6720 2020-07-17 12:10:35 +03:00
parent df93289b73
commit 78fe656042
No known key found for this signature in database
GPG Key ID: 5CE88535E188D369
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/releng/airootfs/root/customize_airootfs.sh
View File

@ -2,6 +2,8 @@
set -e -u 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 sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen
locale-gen locale-gen

16
configs/releng/build.sh
View File

@ -117,14 +117,16 @@ make_setup_mkinitcpio() {
# Customize installation (airootfs) # Customize installation (airootfs)
make_customize_airootfs() { make_customize_airootfs() {
if [ -n "${verbose}" ]; then if [[ -e "${work_dir}/x86_64/airootfs/root/customize_airootfs.sh" ]]; then
mkarchiso -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \ if [ -n "${verbose}" ]; then
-r '/root/customize_airootfs.sh' run mkarchiso -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
else -r '/root/customize_airootfs.sh' run
mkarchiso -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \ else
-r '/root/customize_airootfs.sh' run 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 fi
rm "${work_dir}/x86_64/airootfs/root/customize_airootfs.sh"
} }
# Prepare kernel/initramfs ${install_dir}/boot/ # Prepare kernel/initramfs ${install_dir}/boot/