mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
fix grub config for aarch64
This commit is contained in:
parent
b225863be0
commit
a9902f4e0d
1 changed files with 36 additions and 2 deletions
|
@ -4067,6 +4067,35 @@ EOF
|
||||||
|
|
||||||
NUMBER="0"
|
NUMBER="0"
|
||||||
|
|
||||||
|
if [[ "${RUNNING_ARCH}" == "aarch64" ]]; then
|
||||||
|
cat << EOF >> "${DESTDIR}/${GRUB_PREFIX_DIR}/${GRUB_CFG}"
|
||||||
|
|
||||||
|
# (${NUMBER}) Arch Linux
|
||||||
|
menuentry "Arch Linux" {
|
||||||
|
set gfxpayload="keep"
|
||||||
|
${GRUB_ROOT_DRIVE}
|
||||||
|
${LINUX_MOD_COMMAND}
|
||||||
|
initrd ${subdir}/${AMD_UCODE} ${subdir}/${INITRAMFS}.img
|
||||||
|
}
|
||||||
|
|
||||||
|
EOF
|
||||||
|
|
||||||
|
NUMBER=$((${NUMBER}+1))
|
||||||
|
|
||||||
|
## create kernel fallback entry
|
||||||
|
cat << EOF >> "${DESTDIR}/${GRUB_PREFIX_DIR}/${GRUB_CFG}"
|
||||||
|
|
||||||
|
# (${NUMBER}) Arch Linux Fallback
|
||||||
|
menuentry "Arch Linux Fallback" {
|
||||||
|
set gfxpayload="keep"
|
||||||
|
${GRUB_ROOT_DRIVE}
|
||||||
|
${LINUX_MOD_COMMAND}
|
||||||
|
initrd ${subdir}/${AMD_UCODE} ${subdir}/${INITRAMFS}-fallback.img
|
||||||
|
}
|
||||||
|
|
||||||
|
EOF
|
||||||
|
|
||||||
|
else
|
||||||
cat << EOF >> "${DESTDIR}/${GRUB_PREFIX_DIR}/${GRUB_CFG}"
|
cat << EOF >> "${DESTDIR}/${GRUB_PREFIX_DIR}/${GRUB_CFG}"
|
||||||
|
|
||||||
# (${NUMBER}) Arch Linux
|
# (${NUMBER}) Arch Linux
|
||||||
|
@ -4158,6 +4187,7 @@ fi
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
fi
|
||||||
## copy unicode.pf2 font file
|
## copy unicode.pf2 font file
|
||||||
cp -f "${DESTDIR}/usr/share/grub/unicode.pf2" "${DESTDIR}/${GRUB_PREFIX_DIR}/fonts/unicode.pf2"
|
cp -f "${DESTDIR}/usr/share/grub/unicode.pf2" "${DESTDIR}/${GRUB_PREFIX_DIR}/fonts/unicode.pf2"
|
||||||
|
|
||||||
|
@ -4469,7 +4499,11 @@ run_mkinitcpio() {
|
||||||
( \
|
( \
|
||||||
touch /tmp/setup-mkinitcpio-running
|
touch /tmp/setup-mkinitcpio-running
|
||||||
echo "Initramfs progress ..." > /tmp/initramfs.log; echo >> /tmp/mkinitcpio.log
|
echo "Initramfs progress ..." > /tmp/initramfs.log; echo >> /tmp/mkinitcpio.log
|
||||||
|
if [[ "${RUNNING_ARCH}" == "aarch64" ]]; then
|
||||||
|
chroot ${DESTDIR} /usr/bin/mkinitcpio -p ${KERNELPKG}-${RUNNING_ARCH} >>/tmp/mkinitcpio.log 2>&1
|
||||||
|
else
|
||||||
chroot ${DESTDIR} /usr/bin/mkinitcpio -p ${KERNELPKG} >>/tmp/mkinitcpio.log 2>&1
|
chroot ${DESTDIR} /usr/bin/mkinitcpio -p ${KERNELPKG} >>/tmp/mkinitcpio.log 2>&1
|
||||||
|
fi
|
||||||
echo >> /tmp/mkinitcpio.log
|
echo >> /tmp/mkinitcpio.log
|
||||||
rm -f /tmp/setup-mkinitcpio-running
|
rm -f /tmp/setup-mkinitcpio-running
|
||||||
) &
|
) &
|
||||||
|
|
Loading…
Reference in a new issue