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

try to fix pacsetup

Browse source
This commit is contained in:
Tobias Powalowski 2023-08-03 15:42:29 +02:00
parent d745ba9d22
commit b5c06d7d2e
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
usr/bin/archboot-pacsetup.sh
View file

@ -120,14 +120,9 @@ _update_environment() {
if [[ "${_LOCAL_KERNEL}" == "${_ONLINE_KERNEL}" ]]; then if [[ "${_LOCAL_KERNEL}" == "${_ONLINE_KERNEL}" ]]; then
_progress "98" "No new kernel online available. Skipping update environment." _progress "98" "No new kernel online available. Skipping update environment."
sleep 2 sleep 2
else _progress "100" "Pacman configuration completed successfully."
_dialog --title " New Kernel Available " --defaultno --yesno "Do you want to update the Archboot Environment to ${_ONLINE_KERNEL}?\n\nATTENTION:\nThis will reboot the system using kexec!" 9 60 && _UPDATE_ENVIRONMENT=1 sleep 2
if [[ -n "${_UPDATE_ENVIRONMENT}" ]]; then
_run_update_environment
fi
fi fi
_progress "100" "Pacman configuration completed successfully."
sleep 2
} }
_check _check
@ -171,6 +166,10 @@ if [[ ! -e "/var/cache/pacman/pkg/archboot.db" ]] &&\
[[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -gt "2571000" ]] &&\ [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -gt "2571000" ]] &&\
! [[ "${_RUNNING_ARCH}" == "riscv64" ]]; then ! [[ "${_RUNNING_ARCH}" == "riscv64" ]]; then
_update_environment | _dialog --no-mouse --gauge "Refreshing pacman package database..." 6 70 0 _update_environment | _dialog --no-mouse --gauge "Refreshing pacman package database..." 6 70 0
_dialog --title " New Kernel Available " --defaultno --yesno "Do you want to update the Archboot Environment to ${_ONLINE_KERNEL}?\n\nATTENTION:\nThis will reboot the system using kexec!" 9 60 && _UPDATE_ENVIRONMENT=1
if [[ -n "${_UPDATE_ENVIRONMENT}" ]]; then
_run_update_environment
fi
_cleanup _cleanup
fi fi
_dialog --no-mouse --infobox "Pacman configuration completed successfully." 3 60 _dialog --no-mouse --infobox "Pacman configuration completed successfully." 3 60

2
usr/bin/archboot-update.sh
View file

@ -45,7 +45,7 @@ if [[ -n "${_D_SCRIPTS}" ]]; then
_download_latest _download_latest
fi fi
# Generate new environment and launch it with kexec # Generate new environment and launch it with kexec
if [[ -n "${_L_COMPLETE}" || -n "${_L_INSTALL_COMPLETE}" ]] && [[ -z "${_G_RELEASE}" ]] ; then if [[ -n "${_L_COMPLETE}" || -n "${_L_INSTALL_COMPLETE}" ]] && [[ -z "${_G_RELEASE}" ]]; then
_update_installer_check _update_installer_check
touch /.update touch /.update
_TITLE="Archboot $(uname -m) | Basic Setup | New Environment" _TITLE="Archboot $(uname -m) | Basic Setup | New Environment"