diff --git a/init/0000-armbian-first-login.bash b/init/0000-armbian-first-login.bash index 7db49e7..a47edf8 100755 --- a/init/0000-armbian-first-login.bash +++ b/init/0000-armbian-first-login.bash @@ -45,7 +45,7 @@ if [[ $? -eq 1 ]]; then echo "${MAKE_USER}" >> ${SRC}/logs/${USER_HOST}.log fi -sshpass -p ${PASS_ROOT} ssh ${USER_ROOT}@${USER_HOST} "chsh -s /bin/bash; apt -qq -y install jq stress armbian-config bluez-tools iozone3" &>/dev/null +sshpass -p ${PASS_ROOT} ssh ${USER_ROOT}@${USER_HOST} "chsh -s /bin/bash; apt -y purge armbian-config; apt -qq -y install jq stress armbian-config bluez-tools iozone3" &>/dev/null get_board_data display_alert "${x}. $BOARD_NAME $BOARD_KERNEL" "$USER_HOST" "info" diff --git a/tests/0002-update-and-upgrade.bash b/tests/0002-update-and-upgrade.bash index b08db38..79b82af 100755 --- a/tests/0002-update-and-upgrade.bash +++ b/tests/0002-update-and-upgrade.bash @@ -8,7 +8,7 @@ TEST_SKIP="true" display_alert "$(basename $BASH_SOURCE)" "$(date +%R:%S)" "info" -sshpass -p ${PASS_ROOT} ssh ${USER_ROOT}@${USER_HOST} "LANG=C apt-get -qq -y update &>/dev/null" +sshpass -p ${PASS_ROOT} ssh ${USER_ROOT}@${USER_HOST} "LANG=C apt-get -o Dpkg::Options::=\"--force-confold\" -qq -y update &>/dev/null" PACKAGES=$(sshpass -p ${PASS_ROOT} ssh ${USER_ROOT}@${USER_HOST} "DEBIAN_FRONTEND=noninteractive LANG=C apt-get upgrade -s |grep -P '^\d+ upgraded'|cut -d\" \" -f1") display_alert "Updating and upgrading ${PACKAGES} packages" "${USER_HOST}" "info" sshpass -p ${PASS_ROOT} ssh ${USER_ROOT}@${USER_HOST} "DEBIAN_FRONTEND=noninteractive LANG=C apt-get -y upgrade &>/dev/null" diff --git a/tests/0001-nigtly-stable-switch.bash b/tests/9000-nigtly-stable-switch.bash similarity index 58% rename from tests/0001-nigtly-stable-switch.bash rename to tests/9000-nigtly-stable-switch.bash index 59cb220..0c72027 100755 --- a/tests/0001-nigtly-stable-switch.bash +++ b/tests/9000-nigtly-stable-switch.bash @@ -9,8 +9,8 @@ display_alert "$(basename $BASH_SOURCE)" "$(date +%R:%S)" "info" if (( $r % 2 )); then display_alert "Switch to stable builds" "$(date +%R:%S)" "info" -# sshpass -p ${PASS_ROOT} ssh -t ${USER_ROOT}@${USER_HOST} "LANG=C armbian-config main=System selection=Stable" &>/dev/null + sshpass -p ${PASS_ROOT} ssh -t ${USER_ROOT}@${USER_HOST} "LANG=C armbian-config main=System selection=Stable" &>/dev/null else display_alert "Switch to nightly builds" "$(date +%R:%S)" "info" -# sshpass -p ${PASS_ROOT} ssh -t ${USER_ROOT}@${USER_HOST} "armbian-config main=System selection=Nightly" &>/dev/null + sshpass -p ${PASS_ROOT} ssh -t ${USER_ROOT}@${USER_HOST} "armbian-config main=System selection=Nightly" &>/dev/null fi