mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
add custom grub to offline x86_64 medium too
This commit is contained in:
parent
d795e4d9fb
commit
e9d0013f22
2 changed files with 12 additions and 2 deletions
|
@ -901,8 +901,13 @@ _do_grub_uefi() {
|
||||||
_dialog --infobox "Pacman is running...\n\nInstalling grub-2:2.06.r533.g78bc9a9b2-1 to ${_DESTDIR}...\n\nCheck ${_VC} console (ALT-F${_VC_NUM}) for progress..." 8 70
|
_dialog --infobox "Pacman is running...\n\nInstalling grub-2:2.06.r533.g78bc9a9b2-1 to ${_DESTDIR}...\n\nCheck ${_VC} console (ALT-F${_VC_NUM}) for progress..." 8 70
|
||||||
# fix broken grub with last working version:
|
# fix broken grub with last working version:
|
||||||
# https://lists.gnu.org/archive/html/grub-devel/2023-06/msg00121.html
|
# https://lists.gnu.org/archive/html/grub-devel/2023-06/msg00121.html
|
||||||
${_DLPROG} https://archboot.com/src/grub/grub-2:2.06.r533.g78bc9a9b2-1-x86_64.pkg.tar.zst -P ${_DESTDIR}
|
if [[ -e "${_LOCAL_DB}" ]]; then
|
||||||
${_DLPROG} https://archboot.com/src/grub/grub-2:2.06.r533.g78bc9a9b2-1-x86_64.pkg.tar.zst.sig -P ${_DESTDIR}
|
cp /var/cache/pacman/pkg/grub-2:2.06.r533.g78bc9a9b2-1-x86_64.pkg.tar.zst ${_DESTDIR}
|
||||||
|
cp /var/cache/pacman/pkg/grub-2:2.06.r533.g78bc9a9b2-1-x86_64.pkg.tar.zst.sig ${_DESTDIR}
|
||||||
|
else
|
||||||
|
${_DLPROG} https://archboot.com/src/grub/grub-2:2.06.r533.g78bc9a9b2-1-x86_64.pkg.tar.zst -P ${_DESTDIR}
|
||||||
|
${_DLPROG} https://archboot.com/src/grub/grub-2:2.06.r533.g78bc9a9b2-1-x86_64.pkg.tar.zst.sig -P ${_DESTDIR}
|
||||||
|
fi
|
||||||
${_NSPAWN} pacman -U --noconfirm /grub-2:2.06.r533.g78bc9a9b2-1-x86_64.pkg.tar.zst >>"${_LOG}"
|
${_NSPAWN} pacman -U --noconfirm /grub-2:2.06.r533.g78bc9a9b2-1-x86_64.pkg.tar.zst >>"${_LOG}"
|
||||||
rm ${_DESTDIR}/grub-2:2.06.r533.g78bc9a9b2-1-x86_64.pkg.tar.zst
|
rm ${_DESTDIR}/grub-2:2.06.r533.g78bc9a9b2-1-x86_64.pkg.tar.zst
|
||||||
rm ${_DESTDIR}/grub-2:2.06.r533.g78bc9a9b2-1-x86_64.pkg.tar.zst.sig
|
rm ${_DESTDIR}/grub-2:2.06.r533.g78bc9a9b2-1-x86_64.pkg.tar.zst.sig
|
||||||
|
|
|
@ -43,6 +43,11 @@ _create_iso() {
|
||||||
${_NSPAWN} "${_W_DIR}" pacman -Rdd lvm2 --noconfirm &>/dev/null
|
${_NSPAWN} "${_W_DIR}" pacman -Rdd lvm2 --noconfirm &>/dev/null
|
||||||
echo "Generating local ISO..."
|
echo "Generating local ISO..."
|
||||||
# generate local iso in container
|
# generate local iso in container
|
||||||
|
if [[ "${_ARCH}" == "x86_64" ]]; then
|
||||||
|
echo "Adding custom grub..."
|
||||||
|
wget -q https://archboot.com/src/grub/grub-2:2.06.r533.g78bc9a9b2-1-x86_64.pkg.tar.zst -P ${_W_DIR}/var/cache/pacman/pkg
|
||||||
|
wget -q https://archboot.com/src/grub/grub-2:2.06.r533.g78bc9a9b2-1-x86_64.pkg.tar.zst.sig -P ${_W_DIR}/var/cache/pacman/pkg
|
||||||
|
fi
|
||||||
${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;rm -rf /tmp/*;archboot-${_ARCH}-iso.sh -g -s \
|
${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;rm -rf /tmp/*;archboot-${_ARCH}-iso.sh -g -s \
|
||||||
-p=${_PRESET_LOCAL} -i=${_ISONAME}-local-${_ARCH}" || exit 1
|
-p=${_PRESET_LOCAL} -i=${_ISONAME}-local-${_ARCH}" || exit 1
|
||||||
echo "Generating latest ISO..."
|
echo "Generating latest ISO..."
|
||||||
|
|
Loading…
Reference in a new issue