root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix functions, not working at the moment systemd-boot cannot access iso filesystem :(

Browse source
This commit is contained in:
Tobias Powalowski 2022-05-15 11:10:38 +02:00
parent 7dfda5a698
commit 5d53a45391
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr/bin/archboot-aarch64-iso.sh
View file

@ -13,7 +13,7 @@ _prepare_kernel_initramfs_files || exit 1
_prepare_fedora_shim_bootloaders_aarch64 || exit 1 _prepare_fedora_shim_bootloaders_aarch64 || exit 1
_prepare_efitools_uefi || exit 1 _prepare_efitools_uefi || exit 1
_prepare_uefi_AA64 || exit 1 _prepare_uefi_AA64 || exit 1
_prepare_systemd-boot_AA64 || exit 1 #_prepare_systemd-boot_AA64 || exit 1
_prepare_background || exit 1 _prepare_background || exit 1
_reproducibility _reproducibility
_prepare_uefi_image || exit 1 _prepare_uefi_image || exit 1

16
usr/lib/archboot/iso.sh
View file

@ -141,32 +141,32 @@ _prepare_background() {
_prepare_systemd-boot_X64() { _prepare_systemd-boot_X64() {
echo "Prepare X64 systemd-boot ..." echo "Prepare X64 systemd-boot ..."
[[ -d ${_ISODIR}/boot/systemd-boot ]] || mkdir -p ${_ISODIR}/boot/systemd-boot [[ -d ${_ISODIR}/boot/systemd-boot ]] || mkdir -p ${_ISODIR}/boot/systemd-boot
[[ -d ${_ISODIR}/boot/systemd-boot ]] || mkdir -p ${_ISODIR}/boot/loader/entries [[ -d ${_ISODIR}/boot/loader ]] || mkdir -p ${_ISODIR}/boot/loader/entries
cp /usr/lib/systemd/boot/efi/systemd-bootx64.efi ${_ISODIR}/boot/systemd-boot/ cp /usr/lib/systemd/boot/efi/systemd-bootx64.efi ${_ISODIR}/boot/systemd-boot/
cp /usr/share/archboot/systemd-boot/boot/loader/loader-x64.conf \ cp /usr/share/archboot/systemd-boot/boot/loader/loader-x64.conf \
${_ISODIR}/boot/systemd-boot/loader-x64.conf ${_ISODIR}/boot/loader/loader.conf
if [[ -e ${_ISODIR}/boot/initramfs_x86_64.img ]]; then if [[ -e ${_ISODIR}/boot/initramfs_x86_64.img ]]; then
cp /usr/share/archboot/systemd-boot/boot/loader/entries/archboot-x64.conf \ cp /usr/share/archboot/systemd-boot/boot/loader/entries/archboot-x64.conf \
${_ISODIR}/boot/systemd-boot/entries/archboot-x64.conf ${_ISODIR}/boot/loader/entries/archboot-x64.conf
else else
cp /usr/share/archboot/systemd-boot/boot/loader/entries/archboot-x64-local.conf \ cp /usr/share/archboot/systemd-boot/boot/loader/entries/archboot-x64-local.conf \
${_ISODIR}/boot/systemd-boot/entries/archboot-x64.conf ${_ISODIR}/boot/loader/entries/archboot-x64.conf
fi fi
} }
_prepare_systemd-boot_AA64() { _prepare_systemd-boot_AA64() {
echo "Prepare AA64 systemd-boot ..." echo "Prepare AA64 systemd-boot ..."
[[ -d ${_ISODIR}/boot/systemd-boot ]] || mkdir -p ${_ISODIR}/boot/systemd-boot [[ -d ${_ISODIR}/boot/systemd-boot ]] || mkdir -p ${_ISODIR}/boot/systemd-boot
[[ -d ${_ISODIR}/boot/systemd-boot ]] || mkdir -p ${_ISODIR}/boot/loader/entries [[ -d ${_ISODIR}/boot/loader ]] || mkdir -p ${_ISODIR}/boot/loader/entries
cp /usr/lib/systemd/boot/efi/systemd-bootaa64.efi ${_ISODIR}/boot/systemd-boot/ cp /usr/lib/systemd/boot/efi/systemd-bootaa64.efi ${_ISODIR}/boot/systemd-boot/
cp /usr/share/archboot/systemd-boot/boot/loader/loader-aa64.conf \ cp /usr/share/archboot/systemd-boot/boot/loader/loader-aa64.conf \
${_ISODIR}/boot/systemd-boot/loader-aa64.conf ${_ISODIR}/boot/loader/loader.conf
if [[ -e ${_ISODIR}/boot/initramfs_aarch64.img ]]; then if [[ -e ${_ISODIR}/boot/initramfs_aarch64.img ]]; then
cp /usr/share/archboot/systemd-boot/boot/loader/entries/archboot-aa64.conf \ cp /usr/share/archboot/systemd-boot/boot/loader/entries/archboot-aa64.conf \
${_ISODIR}/boot/systemd-boot/entries/archboot-aa64.conf ${_ISODIR}/boot/loader/entries/archboot-aa64.conf
else else
cp /usr/share/archboot/systemd-boot/boot/loader/entries/archboot-aa64-local.conf \ cp /usr/share/archboot/systemd-boot/boot/loader/entries/archboot-aa64-local.conf \
${_ISODIR}/boot/systemd-boot/entries/archboot-aa64.conf ${_ISODIR}/boot/loader/entries/archboot-aa64.conf
fi fi
} }