Commit 37789a62 authored by Igor Pecovnik's avatar Igor Pecovnik
Browse files

Alter warnings at kernel changing and switching to nightly. Small bugfix at...

Alter warnings at kernel changing and switching to nightly. Small bugfix at selecting default interface
parent e69b5ad7
...@@ -964,9 +964,9 @@ function jobs () ...@@ -964,9 +964,9 @@ function jobs ()
# Switch to daily builds # Switch to daily builds
# #
"Nightly" ) "Nightly" )
dialog --colors --title " \Z1Warning\Z0 " --backtitle "$BACKTITLE" --yes-label "OK" --no-label "Cancel" \ dialog --colors --title " \Z1Warning\Z0 " --backtitle "$BACKTITLE" --yes-label "OK" --no-label "Cancel" --yesno \
--yesno "\nYou are switching to automated nightly repository which is untested and might break your system.\ "\nYou are switching to untested auto-build repository which might break your system.\n\nAre you fine with that?" 10 48
Are you fine with that?" 9 48
if [[ $? = 0 ]]; then if [[ $? = 0 ]]; then
sed -i 's/apt.armbian.com/beta.armbian.com/' /etc/apt/sources.list.d/armbian.list sed -i 's/apt.armbian.com/beta.armbian.com/' /etc/apt/sources.list.d/armbian.list
debconf-apt-progress -- apt-get update debconf-apt-progress -- apt-get update
...@@ -1013,9 +1013,10 @@ function jobs () ...@@ -1013,9 +1013,10 @@ function jobs ()
aval_kernel aval_kernel
if [[ $exitstatus = 0 ]]; then if [[ $exitstatus = 0 ]]; then
exceptions "$INSTALL_KERNEL" exceptions "$INSTALL_KERNEL"
dialog --title " Install and reboot " --colors --backtitle "$BACKTITLE" --yes-label "OK" --no-label "Cancel" \ dialog --title " Install and reboot " --colors --backtitle "$BACKTITLE" --yes-label "OK" --no-label "Cancel" --yesno \
--yesno "\nSwitching to \Z1linux-image${TARGET_BRANCH}-${TARGET_FAMILY}\Z0 \n\nMake sure you know what you are doing! \ "\nSwitching to \Z1linux-image${TARGET_BRANCH}-${TARGET_FAMILY}\Z0 \n\n\
\n\nBoard config will be reverted to defaults." 11 46 Warning: another kernel might not provide the same functionality or can be broken! \
\n\nBoard config will be reverted to defaults." 12 50
if [[ $? = 0 ]]; then if [[ $? = 0 ]]; then
# remove old # remove old
dialog --backtitle "$BACKTITLE" --title "Please wait" --infobox "\nRemoving current kernel." 5 28 dialog --backtitle "$BACKTITLE" --title "Please wait" --infobox "\nRemoving current kernel." 5 28
......
...@@ -507,7 +507,7 @@ function select_default_interface () ...@@ -507,7 +507,7 @@ function select_default_interface ()
{ {
IFS=$'\r\n' IFS=$'\r\n'
GLOBIGNORE='*' GLOBIGNORE='*'
local ADAPTER=($(ls /sys/class/net | grep -E -v 'lo|tun|bonding_masters|dummy0')) local ADAPTER=($(ls /sys/class/net | grep -E -v 'lo|tun|bonding_masters|dummy0|bond0|sit0'))
local LIST=() local LIST=()
for i in "${ADAPTER[@]}" for i in "${ADAPTER[@]}"
do do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment