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

fix _run_mkinitcpio in autoconfiguration

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-12 20:32:55 +01:00
parent df77e881f0
commit fcdfe00cb3
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr/lib/archboot/installer/autoconfiguration.sh
View file

@ -153,7 +153,7 @@ _auto_mkinitcpio() {
[[ -e "${_DESTDIR}/boot/initramfs-linux-fallback.img" ]] && rm -f "${_DESTDIR}/boot/initramfs-linux-fallback.img"
sleep 2
_AUTO_MKINITCPIO=1
run_mkinitcpio
_run_mkinitcpio
fi
}

8
usr/lib/archboot/installer/autoprepare.sh
View file

@ -109,12 +109,12 @@ _autoprepare() {
fi
_DISK_SIZE="$((_DISK_SIZE-_UEFISYS_DEVICE_SIZE))"
while [[ -z "${_BOOT_DEVICE_SET}" ]]; do
_dialog --inputbox "Enter the size (MB) of your /boot partition,\nMinimum value is 16.\n\nDisk space left: ${_DISK_SIZE} MB" 10 65 "512" 2>"${_ANSWER}" || return 1
_dialog --inputbox "Enter the size (MB) of your /boot partition,\nMinimum value is 100.\n\nDisk space left: ${_DISK_SIZE} MB" 10 65 "512" 2>"${_ANSWER}" || return 1
_BOOT_DEVICE_SIZE="$(cat "${_ANSWER}")"
if [[ -z "${_BOOT_DEVICE_SIZE}" ]]; then
_dialog --msgbox "ERROR: You have entered a invalid size, please enter again." 0 0
else
if [[ "${_BOOT_DEVICE_SIZE}" -ge "${_DISK_SIZE}" || "${_BOOT_DEVICE_SIZE}" -lt "16" || "${_BOOT_DEVICE_SIZE}" == "${_DISK_SIZE}" ]]; then
if [[ "${_BOOT_DEVICE_SIZE}" -ge "${_DISK_SIZE}" || "${_BOOT_DEVICE_SIZE}" -lt "100" || "${_BOOT_DEVICE_SIZE}" == "${_DISK_SIZE}" ]]; then
_dialog --msgbox "ERROR: You have entered an invalid size, please enter again." 0 0
else
_BOOT_DEVICE_SET=1
@ -126,12 +126,12 @@ _autoprepare() {
done
else
while [[ -z "${BOOT_DEVICE_SET}" ]]; do
_dialog --inputbox "Enter the size (MB) of your /boot partition,\nMinimum value is 16.\n\nDisk space left: ${_DISK_SIZE} MB" 10 65 "512" 2>"${_ANSWER}" || return 1
_dialog --inputbox "Enter the size (MB) of your /boot partition,\nMinimum value is 100.\n\nDisk space left: ${_DISK_SIZE} MB" 10 65 "512" 2>"${_ANSWER}" || return 1
_BOOT_DEVICE_SIZE="$(cat "${_ANSWER}")"
if [[ -z "${_BOOT_DEVICE_SIZE}" ]]; then
_dialog --msgbox "ERROR: You have entered a invalid size, please enter again." 0 0
else
if [[ "${_BOOT_DEVICE_SIZE}" -ge "${_DISK_SIZE}" || "${_BOOT_DEVICE_SIZE}" -lt "16" || "${_BOOT_DEVICE_SIZE}" == "${_DISK_SIZE}" ]]; then
if [[ "${_BOOT_DEVICE_SIZE}" -ge "${_DISK_SIZE}" || "${_BOOT_DEVICE_SIZE}" -lt "100" || "${_BOOT_DEVICE_SIZE}" == "${_DISK_SIZE}" ]]; then
_dialog --msgbox "ERROR: You have entered an invalid size, please enter again." 0 0
else
_BOOT_DEVICE_SET=1