mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 12:00:37 +02:00
fix _run_mkinitcpio in autoconfiguration
This commit is contained in:
parent
df77e881f0
commit
fcdfe00cb3
2 changed files with 5 additions and 5 deletions
|
@ -153,7 +153,7 @@ _auto_mkinitcpio() {
|
||||||
[[ -e "${_DESTDIR}/boot/initramfs-linux-fallback.img" ]] && rm -f "${_DESTDIR}/boot/initramfs-linux-fallback.img"
|
[[ -e "${_DESTDIR}/boot/initramfs-linux-fallback.img" ]] && rm -f "${_DESTDIR}/boot/initramfs-linux-fallback.img"
|
||||||
sleep 2
|
sleep 2
|
||||||
_AUTO_MKINITCPIO=1
|
_AUTO_MKINITCPIO=1
|
||||||
run_mkinitcpio
|
_run_mkinitcpio
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -109,12 +109,12 @@ _autoprepare() {
|
||||||
fi
|
fi
|
||||||
_DISK_SIZE="$((_DISK_SIZE-_UEFISYS_DEVICE_SIZE))"
|
_DISK_SIZE="$((_DISK_SIZE-_UEFISYS_DEVICE_SIZE))"
|
||||||
while [[ -z "${_BOOT_DEVICE_SET}" ]]; do
|
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}")"
|
_BOOT_DEVICE_SIZE="$(cat "${_ANSWER}")"
|
||||||
if [[ -z "${_BOOT_DEVICE_SIZE}" ]]; then
|
if [[ -z "${_BOOT_DEVICE_SIZE}" ]]; then
|
||||||
_dialog --msgbox "ERROR: You have entered a invalid size, please enter again." 0 0
|
_dialog --msgbox "ERROR: You have entered a invalid size, please enter again." 0 0
|
||||||
else
|
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
|
_dialog --msgbox "ERROR: You have entered an invalid size, please enter again." 0 0
|
||||||
else
|
else
|
||||||
_BOOT_DEVICE_SET=1
|
_BOOT_DEVICE_SET=1
|
||||||
|
@ -126,12 +126,12 @@ _autoprepare() {
|
||||||
done
|
done
|
||||||
else
|
else
|
||||||
while [[ -z "${BOOT_DEVICE_SET}" ]]; do
|
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}")"
|
_BOOT_DEVICE_SIZE="$(cat "${_ANSWER}")"
|
||||||
if [[ -z "${_BOOT_DEVICE_SIZE}" ]]; then
|
if [[ -z "${_BOOT_DEVICE_SIZE}" ]]; then
|
||||||
_dialog --msgbox "ERROR: You have entered a invalid size, please enter again." 0 0
|
_dialog --msgbox "ERROR: You have entered a invalid size, please enter again." 0 0
|
||||||
else
|
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
|
_dialog --msgbox "ERROR: You have entered an invalid size, please enter again." 0 0
|
||||||
else
|
else
|
||||||
_BOOT_DEVICE_SET=1
|
_BOOT_DEVICE_SET=1
|
||||||
|
|
Loading…
Reference in a new issue