Skip to content
Snippets Groups Projects
Unverified Commit 78fe6560 authored by nl6720's avatar nl6720
Browse files

Deprecate customize_airootfs.sh

Show a deprecation notice if airootfs/root/customize_airootfs.sh is found.
parent df93289b
No related branches found
No related tags found
1 merge request!44build.sh reorganization
...@@ -2,6 +2,8 @@ ...@@ -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
......
...@@ -117,14 +117,16 @@ make_setup_mkinitcpio() { ...@@ -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/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment