CHANGELOG

@@ -18,7 +18,6 @@ Environment Changes:
 - renamed archboot-locale script to localize script
 - preserving Basic Setup values when running kexec task
 - load archboot.com and wiki.archlinux.org on firefox startup
-- always enable NTP by default
 localize:
 - fixed abort dialog
 update:

usr/bin/archboot-clock.sh

@@ -49,16 +49,18 @@ _timeset() {
     _hwclock
     # check internet connection
     if ping -c1 www.google.com &>/dev/null; then
-        _dialog --infobox "Syncing clock with NTP pool..." 3 45
-        sleep 3
-        # sync immediatly with standard pool
-        if ! systemctl restart systemd-timesyncd; then
-            _dialog --msgbox "An error has occured, time was not changed!" 0 0
-            _SET_TIME=""
-        else
-            # enable background syncing
-            timedatectl set-ntp 1
-            _SET_TIME="1"
+        if _dialog --yesno \
+        "Do you want to use the Network Time Protocol (NTP) for syncing your clock, by using the internet clock pool?" 6 60; then
+            _dialog --infobox "Syncing clock with NTP pool..." 3 45
+            # sync immediatly with standard pool
+            if ! systemctl restart systemd-timesyncd; then
+                _dialog --msgbox "An error has occured, time was not changed!" 0 0
+                _SET_TIME=""
+            else
+                # enable background syncing
+                timedatectl set-ntp 1
+                _SET_TIME="1"
+            fi
         fi
     fi
     if [[ -z "${_SET_TIME}" ]]; then

usr/bin/archboot-launcher.sh

@@ -105,7 +105,7 @@ _launcher() {
     if [[ -n "${_MANAGE[@]}" ]]; then
         _MENU+=( "3" "Manage Archboot Environment" )
     fi
-    _dialog  --default-item "${_DEFAULTITEM}" --cancel-label "Exit" --title " Main Menu " --menu "" 9 40 5 \
+    _dialog --cancel-label "Exit" --title " Main Menu " --menu "" 9 40 5 \
     "1" "Launch Archboot Setup" "${_MENU[@]}" 2>${_ANSWER}
     case $(cat ${_ANSWER}) in
         "1")
@@ -113,11 +113,9 @@ _launcher() {
             setup
             exit 0 ;;
         "2")
-            _DEFAULTITEM=2
             _desktop
             ;;
         "3")
-            _DEFAULTITEM=3
             _manage
             ;;
         *)
@@ -127,7 +125,6 @@ _launcher() {
 }
 
 _check
-_DEFAULTITEM=1
 while true; do
     _check_desktop
     _check_manage

usr/bin/archboot-pacsetup.sh

@@ -17,8 +17,8 @@ _select_mirror() {
     # FIXME: this regex doesn't honor commenting
     _MIRRORS=$(grep -E -o '((http)|(https))://[^/]*' "${_MIRRORLIST}" | sed 's|$| _|g')
     #shellcheck disable=SC2086
-    _dialog --cancel-label "Exit" --title " Package Mirror " --menu "" 13 55 7 \
-    "Custom" "_"  ${_MIRRORS} 2>${_ANSWER} || _abort
+    _dialog --no-cancel --title " Package Mirror " --menu "" 13 55 7 \
+    "Custom" "_"  ${_MIRRORS} 2>${_ANSWER} || return 1
     #shellcheck disable=SC2155
     local _SERVER=$(cat "${_ANSWER}")
     if [[ "${_SERVER}" == "Custom" ]]; then
@@ -115,14 +115,9 @@ _update_environment() {
 }
 
 _check
-if ! ping -c1 www.google.com &>/dev/null; then
-    _dialog --title " ERROR " --infobox "Your network is not working. Please reconfigure it." 3 60
-    sleep 5
-    _abort
-fi
 while true; do
     _enable_testing
-    _select_mirror || exit 1
+    _select_mirror
     if _prepare_pacman; then
         break
     else

usr/bin/archboot-vconsole.sh

@@ -59,7 +59,7 @@ _vconsole_keymap() {
         fi
         if [[ -n "${_CONTINUE}" ]]; then
             _KEYMAPS=""
-            for i in $(${_LIST_MAPS} | grep "^${_KEYMAP}" | grep -v 'olpc' | grep -v 'mobii' | grep -v 'alt' | grep -v '^carpalx' | grep -v 'defkey' | grep -v 'mac' | grep -v 'amiga' | grep -v 'sun' | grep -v 'atari'); do
+            for i in $(${_LIST_MAPS} | grep "^${_KEYMAP}" | grep -v '^carpalx' | grep -v 'defkey' | grep -v 'mac' | grep -v 'amiga' | grep -v 'sun' | grep -v 'atari'); do
                 _KEYMAPS="${_KEYMAPS} ${i} -"
             done
             #shellcheck disable=SC2086