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

start at select source in setup

Browse source
This commit is contained in:
Tobias Powalowski 2023-07-12 11:56:00 +02:00
parent ce70d1b0d3
commit 710bca62f1
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
usr/lib/archboot/installer/base.sh
View file

@ -280,15 +280,15 @@ _mainmenu() {
if [[ -n "${_NEXTITEM}" ]]; then if [[ -n "${_NEXTITEM}" ]]; then
_DEFAULT="--default-item ${_NEXTITEM}" _DEFAULT="--default-item ${_NEXTITEM}"
else else
_DEFAULT="" _DEFAULT="3"
fi fi
#shellcheck disable=SC2086 #shellcheck disable=SC2086
dialog ${_DEFAULT} --backtitle "${_TITLE}" --title " MAIN MENU " \ dialog ${_DEFAULT} --backtitle "${_TITLE}" --title " MAIN MENU " \
--menu "Use the UP and DOWN arrows to navigate menus.\nUse TAB to switch between buttons and ENTER to select." 17 58 14 \ --menu "Use the UP and DOWN arrows to navigate menus.\nUse TAB to switch between buttons and ENTER to select." 17 58 14 \
"0" "Configure Console" \ "0" "Configure Console" \
"1" "Configure Network" \ "1" "Configure Network" \
"2" "Select Source" \ "2" "Configure Clock" \
"3" "Configure Clock" \ "3" "Select Source" \
"4" "Prepare Storage Device" \ "4" "Prepare Storage Device" \
"5" "Install Packages" \ "5" "Install Packages" \
"6" "Configure System" \ "6" "Configure System" \
@ -305,6 +305,9 @@ _mainmenu() {
_donetwork _donetwork
fi ;; fi ;;
"2") "2")
_set_clock ;;
"3")
if [[ "${_DESTDIR}" == "/" ]]; then if [[ "${_DESTDIR}" == "/" ]]; then
_abort_running_system _abort_running_system
elif [[ -e "/var/cache/pacman/pkg/archboot.db" ]]; then elif [[ -e "/var/cache/pacman/pkg/archboot.db" ]]; then
@ -313,8 +316,6 @@ _mainmenu() {
_select_source || return 1 _select_source || return 1
_update_environment _update_environment
fi ;; fi ;;
"3")
_set_clock ;;
"4") "4")
if [[ "${_DESTDIR}" == "/" ]]; then if [[ "${_DESTDIR}" == "/" ]]; then
_abort_running_system _abort_running_system