@@ -638,11 +638,9 @@ make_pacman_conf() {
638638 sed -r " s|^#?\\ s*CacheDir.+|CacheDir = $( echo -n ${_cache_dirs[@]} ) |g" ${build_pacman_conf} > " ${work_dir} /pacman-${arch} .conf"
639639}
640640
641- # Base installation, plus needed packages (airootfs)
641+ # Base installation (airootfs)
642642make_basefs () {
643643 ${mkalteriso} ${mkalteriso_option} -w " ${work_dir} /${arch} " -C " ${work_dir} /pacman-${arch} .conf" -D " ${install_dir} " init
644- # ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" -p "haveged intel-ucode amd-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh efitools" install
645- ${mkalteriso} ${mkalteriso_option} -w " ${work_dir} /${arch} " -C " ${work_dir} /pacman-${arch} .conf" -D " ${install_dir} " -p " bash haveged intel-ucode amd-ucode mkinitcpio-nfs-utils nbd" install
646644
647645 # Install plymouth.
648646 if [[ " ${boot_splash} " = true ]]; then
@@ -964,10 +962,18 @@ make_boot() {
964962
965963# Add other aditional/extra files to ${install_dir}/boot/
966964make_boot_extra () {
967- cp " ${work_dir} /${arch} /airootfs/boot/intel-ucode.img" " ${work_dir} /iso/${install_dir} /boot/intel_ucode.img"
968- cp " ${work_dir} /${arch} /airootfs/usr/share/licenses/intel-ucode/LICENSE" " ${work_dir} /iso/${install_dir} /boot/intel_ucode.LICENSE"
969- cp " ${work_dir} /${arch} /airootfs/boot/amd-ucode.img" " ${work_dir} /iso/${install_dir} /boot/amd_ucode.img"
970- cp " ${work_dir} /${arch} /airootfs/usr/share/licenses/amd-ucode/LICENSE.amd-ucode" " ${work_dir} /iso/${install_dir} /boot/amd_ucode.LICENSE"
965+ if [[ -e " ${work_dir} /${arch} /airootfs/boot/memtest86+/memtest.bin" ]]; then
966+ cp " ${work_dir} /${arch} /airootfs/boot/memtest86+/memtest.bin" " ${work_dir} /iso/${install_dir} /boot/memtest"
967+ cp " ${work_dir} /${arch} /airootfs/usr/share/licenses/common/GPL2/license.txt" " ${work_dir} /iso/${install_dir} /boot/memtest.COPYING"
968+ fi
969+ if [[ -e " ${work_dir} /${arch} /airootfs/boot/intel-ucode.img" ]]; then
970+ cp " ${work_dir} /${arch} /airootfs/boot/intel-ucode.img" " ${work_dir} /iso/${install_dir} /boot/intel_ucode.img"
971+ cp " ${work_dir} /${arch} /airootfs/usr/share/licenses/intel-ucode/LICENSE" " ${work_dir} /iso/${install_dir} /boot/intel_ucode.LICENSE"
972+ fi
973+ if [[ -e " ${work_dir} /${arch} /airootfs/boot/amd-ucode.img" ]]; then
974+ cp " ${work_dir} /${arch} /airootfs/boot/amd-ucode.img" " ${work_dir} /iso/${install_dir} /boot/amd_ucode.img"
975+ cp " ${work_dir} /${arch} /airootfs/usr/share/licenses/amd-ucode/LICENSE" " ${work_dir} /iso/${install_dir} /boot/amd_ucode.LICENSE"
976+ fi
971977}
972978
973979# Prepare /${install_dir}/boot/syslinux
0 commit comments