mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
add always latest refind
This commit is contained in:
parent
8ca264daaf
commit
04792068d9
3 changed files with 20 additions and 14 deletions
|
@ -26,7 +26,7 @@ btrfs-progs nilfs-utils linux-firmware ipw2100-fw ipw2200-fw iana-etc chntpw lib
|
||||||
grub2-common grub2-bios grub2-efi-x86_64 efibootmgr file eject keyutils yp-tools \
|
grub2-common grub2-bios grub2-efi-x86_64 efibootmgr file eject keyutils yp-tools \
|
||||||
curl smartmontools dnsmasq lftp openconnect libxml2 libproxy speedtouch tcpdump nmap lua weechat \
|
curl smartmontools dnsmasq lftp openconnect libxml2 libproxy speedtouch tcpdump nmap lua weechat \
|
||||||
gnutls nettle libtasn1 bind rpcbind expat progsreiserfs glib2 freetype2 libssh2 libfetch libedit \
|
gnutls nettle libtasn1 bind rpcbind expat progsreiserfs glib2 freetype2 libssh2 libfetch libedit \
|
||||||
talloc eventlog idnkit libjpeg-turbo pth gnupg libksba libassuan pinentry dirmngr gpgme"
|
talloc eventlog idnkit libjpeg-turbo pth gnupg libksba libassuan pinentry dirmngr gpgme ldns dnssec-anchors"
|
||||||
|
|
||||||
|
|
||||||
for i in $DEPENDS; do
|
for i in $DEPENDS; do
|
||||||
|
|
|
@ -26,7 +26,7 @@ nilfs-utils linux-firmware ipw2100-fw ipw2200-fw iana-etc chntpw libusb grub2-co
|
||||||
grub2-efi-x86_64 efibootmgr file eject keyutils yp-tools smartmontools curl dnsmasq \
|
grub2-efi-x86_64 efibootmgr file eject keyutils yp-tools smartmontools curl dnsmasq \
|
||||||
lftp openconnect libproxy libxml2 speedtouch tcpdump nmap lua weechat gnutls nettle libtasn1 bind rpcbind \
|
lftp openconnect libproxy libxml2 speedtouch tcpdump nmap lua weechat gnutls nettle libtasn1 bind rpcbind \
|
||||||
expat progsreiserfs glib2 freetype2 libssh2 libfetch libedit talloc eventlog idnkit libjpeg-turbo \
|
expat progsreiserfs glib2 freetype2 libssh2 libfetch libedit talloc eventlog idnkit libjpeg-turbo \
|
||||||
pth gnupg libksba libassuan pinentry dirmngr gpgme"
|
pth gnupg libksba libassuan pinentry dirmngr gpgme ldns dnssec-anchors"
|
||||||
|
|
||||||
for i in $DEPENDS; do
|
for i in $DEPENDS; do
|
||||||
for k in $(echo /var/lib/pacman/local/$i-[0-9]*-[0-9]*); do
|
for k in $(echo /var/lib/pacman/local/$i-[0-9]*-[0-9]*); do
|
||||||
|
|
|
@ -3453,18 +3453,23 @@ dorefind_uefi_common() {
|
||||||
run_pacman
|
run_pacman
|
||||||
PACKAGES=""
|
PACKAGES=""
|
||||||
|
|
||||||
_REFIND_VER="0.2.7"
|
rm -rf "/tmp"/refind-bin* || true
|
||||||
|
curl -L "http://sourceforge.net/projects/refind/files/latest/download" -o "/tmp/refind-bin.zip"
|
||||||
wget -O "/tmp/refind-bin-${_REFIND_VER}.zip" "http://downloads.sourceforge.net/refind/refind-bin-${_REFIND_VER}.zip"
|
bsdtar -C "/tmp" -xf "/tmp/refind-bin.zip"
|
||||||
bsdtar -C "/tmp" -xf "/tmp/refind-bin-${_REFIND_VER}.zip"
|
mv "/tmp"/refind-bin-* "/tmp/refind-bin-dir"
|
||||||
|
|
||||||
install -d "${DESTDIR}/boot/efi/efi/arch/refind"
|
install -d "${DESTDIR}/boot/efi/efi/arch/refind"
|
||||||
install -D -m0644 "/tmp/refind-bin-${_REFIND_VER}/refind/refind_${SPEC_UEFI_ARCH}.efi" "${DESTDIR}/boot/efi/efi/arch/refind/refind${SPEC_UEFI_ARCH}.efi"
|
install -D -m0644 "/tmp/refind-bin-dir/refind/refind_${SPEC_UEFI_ARCH}.efi" "${DESTDIR}/boot/efi/efi/arch/refind/refind${SPEC_UEFI_ARCH}.efi"
|
||||||
install -D -m0644 "/tmp/refind-bin-${_REFIND_VER}/refind/refind.conf-sample" "${DESTDIR}/boot/efi/efi/arch/refind/refind.conf"
|
install -D -m0644 "/tmp/refind-bin-dir/refind/refind.conf-sample" "${DESTDIR}/boot/efi/efi/arch/refind/refind.conf"
|
||||||
cp -r "/tmp/refind-bin-${_REFIND_VER}/refind/icons" "${DESTDIR}/boot/efi/efi/arch/refind/icons"
|
cp -r "/tmp/refind-bin-dir/refind/icons" "${DESTDIR}/boot/efi/efi/arch/refind/icons"
|
||||||
|
cp -r "/tmp/refind-bin-dir/docs" "${DESTDIR}/boot/efi/efi/arch/refind/docs"
|
||||||
|
install -D -m0644 "/tmp/refind-bin-dir"/*.txt "${DESTDIR}/boot/efi/efi/arch/refind/docs"/
|
||||||
|
|
||||||
|
sed 's|^timeout 20|timeout 0|g' -i "${DESTDIR}/boot/efi/efi/arch/refind/refind.conf"
|
||||||
sed 's|^#showtools shell, about, reboot|showtools shell,about,exit,shutdown,reboot|g' -i "${DESTDIR}/boot/efi/efi/arch/refind/refind.conf"
|
sed 's|^#showtools shell, about, reboot|showtools shell,about,exit,shutdown,reboot|g' -i "${DESTDIR}/boot/efi/efi/arch/refind/refind.conf"
|
||||||
sed 's|^scanfor internal,external,optical|scanfor internal,external,optical,manual|g' -i "${DESTDIR}/boot/efi/efi/arch/refind/refind.conf"
|
sed 's|^#scan_driver_dirs EFI/tools/drivers,drivers|scan_driver_dirs EFI/tools/drivers|g' -i "${DESTDIR}/boot/efi/efi/arch/refind/refind.conf"
|
||||||
|
sed 's|^#scanfor internal,external,optical|scanfor internal,external,optical,manual|g' -i "${DESTDIR}/boot/efi/efi/arch/refind/refind.conf"
|
||||||
|
sed 's|^#max_tags 0|max_tags 0|g' -i "${DESTDIR}/boot/efi/efi/arch/refind/refind.conf"
|
||||||
|
|
||||||
# install -D -m0644 "${DESTDIR}/boot/efi/efi/arch/refind/refind_linux.conf" "${DESTDIR}/boot/efi/efi/arch/refind_linux.conf" || true
|
# install -D -m0644 "${DESTDIR}/boot/efi/efi/arch/refind/refind_linux.conf" "${DESTDIR}/boot/efi/efi/arch/refind_linux.conf" || true
|
||||||
|
|
||||||
|
@ -3486,7 +3491,7 @@ dorefind_uefi_common() {
|
||||||
[[ "${NAME_SCHEME_PARAMETER}" == "PARTUUID" ]] && _rootpart="/dev/disk/by-partuuid/${ROOT_PART_GPT_GUID}"
|
[[ "${NAME_SCHEME_PARAMETER}" == "PARTUUID" ]] && _rootpart="/dev/disk/by-partuuid/${ROOT_PART_GPT_GUID}"
|
||||||
[[ "${NAME_SCHEME_PARAMETER}" == "FSLABEL" ]] && _rootpart="LABEL=${ROOT_PART_FS_LABEL}"
|
[[ "${NAME_SCHEME_PARAMETER}" == "FSLABEL" ]] && _rootpart="LABEL=${ROOT_PART_FS_LABEL}"
|
||||||
[[ "${NAME_SCHEME_PARAMETER}" == "PARTLABEL" ]] && _rootpart="/dev/disk/by-partlabel/${ROOT_PART_GPT_LABEL}"
|
[[ "${NAME_SCHEME_PARAMETER}" == "PARTLABEL" ]] && _rootpart="/dev/disk/by-partlabel/${ROOT_PART_GPT_LABEL}"
|
||||||
[[ "${_rootpart}" == "" ]] && _rootpart="${ROOT_PART_DEVICE}"
|
[[ "${_rootpart}" == "" ]] && _rootpart="${_rootdev}"
|
||||||
|
|
||||||
## TODO: All complex stuff like dmraid, cyptsetup etc. for kernel parameters - common_bootloader_checks ?
|
## TODO: All complex stuff like dmraid, cyptsetup etc. for kernel parameters - common_bootloader_checks ?
|
||||||
_PARAMETERS_UNMOD="root=${_rootpart} ${ROOTFLAGS} rootfstype=${ROOTFS} ${RAIDARRAYS} ${CRYPTSETUP} ro initrd=\\EFI\\arch\\${INITRAMFS}.img"
|
_PARAMETERS_UNMOD="root=${_rootpart} ${ROOTFLAGS} rootfstype=${ROOTFS} ${RAIDARRAYS} ${CRYPTSETUP} ro initrd=\\EFI\\arch\\${INITRAMFS}.img"
|
||||||
|
@ -4215,9 +4220,10 @@ EOF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# fallback to device if no label or uuid can be detected, eg. luks device
|
# fallback to device if no label or uuid can be detected, eg. luks device
|
||||||
[[ -z "${ROOT_PART_FS_LABEL}" ]] && _rootpart="${ROOT_PART_DEVICE}"
|
if [[ -z "${ROOT_PART_FS_UUID}" ]] && [[ -z "${ROOT_PART_FS_LABEL}" ]]; then
|
||||||
[[ -z "${ROOT_PART_FS_UUID}" ]] && _rootpart="${ROOT_PART_DEVICE}"
|
_rootpart="${ROOT_PART_DEVICE}"
|
||||||
|
fi
|
||||||
|
|
||||||
LINUX_UNMOD_COMMAND="linux ${subdir}/${VMLINUZ} root=${_rootpart} ${ROOTFLAGS} rootfstype=${ROOTFS} ${RAIDARRAYS} ${CRYPTSETUP} ro"
|
LINUX_UNMOD_COMMAND="linux ${subdir}/${VMLINUZ} root=${_rootpart} ${ROOTFLAGS} rootfstype=${ROOTFS} ${RAIDARRAYS} ${CRYPTSETUP} ro"
|
||||||
LINUX_MOD_COMMAND=$(echo "${LINUX_UNMOD_COMMAND}" | sed -e 's# # #g' | sed -e 's# # #g')
|
LINUX_MOD_COMMAND=$(echo "${LINUX_UNMOD_COMMAND}" | sed -e 's# # #g' | sed -e 's# # #g')
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue