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

minor fixes

Browse source
This commit is contained in:
Tobias Powalowski 2023-07-15 21:51:09 +02:00
parent 3ade064086
commit c620ae1056
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
usr/lib/archboot/installer/bootloader.sh
View file

@ -269,8 +269,8 @@ _do_mok_sign () {
if [[ -n "${_SIGN_MOK}" ]]; then if [[ -n "${_SIGN_MOK}" ]]; then
${_NSPAWN} sbsign --key /"${_KEYDIR}"/MOK/MOK.key --cert /"${_KEYDIR}"/MOK/MOK.crt --output /boot/"${_VMLINUZ}" /boot/"${_VMLINUZ}" &>"${_LOG}" ${_NSPAWN} sbsign --key /"${_KEYDIR}"/MOK/MOK.key --cert /"${_KEYDIR}"/MOK/MOK.crt --output /boot/"${_VMLINUZ}" /boot/"${_VMLINUZ}" &>"${_LOG}"
${_NSPAWN} sbsign --key /"${_KEYDIR}"/MOK/MOK.key --cert /"${_KEYDIR}"/MOK/MOK.crt --output "${_UEFI_BOOTLOADER_DIR}"/grub"${_SPEC_UEFI_ARCH}".efi "${_UEFI_BOOTLOADER_DIR}"/grub"${_SPEC_UEFI_ARCH}".efi &>"${_LOG}" ${_NSPAWN} sbsign --key /"${_KEYDIR}"/MOK/MOK.key --cert /"${_KEYDIR}"/MOK/MOK.crt --output "${_UEFI_BOOTLOADER_DIR}"/grub"${_SPEC_UEFI_ARCH}".efi "${_UEFI_BOOTLOADER_DIR}"/grub"${_SPEC_UEFI_ARCH}".efi &>"${_LOG}"
_dialog --infobox "/boot/${_VMLINUZ} and ${_UEFI_BOOTLOADER_DIR}/grub${_SPEC_UEFI_ARCH}.efi\n\nhave been signed successfully.\nContinuing in 5 seconds..." 6 60 _dialog --infobox "/boot/${_VMLINUZ} and ${_UEFI_BOOTLOADER_DIR}/grub${_SPEC_UEFI_ARCH}.efi\n\nhave been signed successfully." 5 60
sleep 5 sleep 3
fi fi
} }
@ -762,8 +762,8 @@ label linux
initrd ${_SUBDIR}/${_INITRAMFS} initrd ${_SUBDIR}/${_INITRAMFS}
append ${_KERNEL_PARAMS_COMMON_MOD} append ${_KERNEL_PARAMS_COMMON_MOD}
EOF EOF
_dialog --infobox "UBOOT has been installed successfully.\nContinuing in 5 seconds..." 4 55 _dialog --infobox "UBOOT has been installed successfully." 3 55
sleep 5 sleep 3
} }
_do_grub_bios() { _do_grub_bios() {
@ -919,8 +919,8 @@ _do_grub_uefi() {
mkdir -p "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT" mkdir -p "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT"
rm -f "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI" rm -f "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI"
cp -f "${_DESTDIR}/${_UEFISYS_MP}/EFI/grub/grub${_SPEC_UEFI_ARCH}.efi" "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI" cp -f "${_DESTDIR}/${_UEFISYS_MP}/EFI/grub/grub${_SPEC_UEFI_ARCH}.efi" "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI"
_dialog --infobox "GRUB(2) for ${_UEFI_ARCH} UEFI has been installed successfully.\n\nContinuing in 5 seconds..." 5 60 _dialog --infobox "GRUB(2) for ${_UEFI_ARCH} UEFI has been installed successfully." 3 60
sleep 5 sleep 3
_S_BOOTLOADER=1 _S_BOOTLOADER=1
elif [[ -e "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/grub${_SPEC_UEFI_ARCH}.efi" && -n "${_UEFI_SECURE_BOOT}" ]]; then elif [[ -e "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/grub${_SPEC_UEFI_ARCH}.efi" && -n "${_UEFI_SECURE_BOOT}" ]]; then
_do_secureboot_keys || return 1 _do_secureboot_keys || return 1

1
usr/lib/archboot/installer/configuration.sh
View file

@ -75,6 +75,7 @@ _set_password() {
_PASSWORD=/tmp/.password _PASSWORD=/tmp/.password
else else
_dialog --title " ERROR " --infobox "Password didn't match, please enter again." 5 50 _dialog --title " ERROR " --infobox "Password didn't match, please enter again." 5 50
sleep 3
_PASSWORD="" _PASSWORD=""
_PASS="" _PASS=""
_PASS2="" _PASS2=""

4
usr/lib/archboot/installer/pacman.sh
View file

@ -93,8 +93,8 @@ _update_environment() {
echo "${_LOCAL_KERNEL} local kernel version and ${_ONLINE_KERNEL} online kernel version." >"${_LOG}" echo "${_LOCAL_KERNEL} local kernel version and ${_ONLINE_KERNEL} online kernel version." >"${_LOG}"
sleep 2 sleep 2
if [[ "${_LOCAL_KERNEL}" == "${_ONLINE_KERNEL}" ]]; then if [[ "${_LOCAL_KERNEL}" == "${_ONLINE_KERNEL}" ]]; then
_dialog --infobox "No new kernel online available.\nSkipping update environment.\nContinuing in 5 seconds..." 5 50 _dialog --infobox "No new kernel online available.\nSkipping update environment." 4 50
sleep 5 sleep 3
else else
_dialog --defaultno --yesno "New online kernel version ${_ONLINE_KERNEL} available.\n\nDo you want to update the archboot environment to latest packages with caching packages for installation?\n\nATTENTION:\nThis will reboot the system using kexec!" 11 60 && _UPDATE_ENVIRONMENT=1 _dialog --defaultno --yesno "New online kernel version ${_ONLINE_KERNEL} available.\n\nDo you want to update the archboot environment to latest packages with caching packages for installation?\n\nATTENTION:\nThis will reboot the system using kexec!" 11 60 && _UPDATE_ENVIRONMENT=1
if [[ -n "${_UPDATE_ENVIRONMENT}" ]]; then if [[ -n "${_UPDATE_ENVIRONMENT}" ]]; then