Skip to content

GitLab

Commit aaf06114 authored by Igor Pecovnik's avatar Igor Pecovnik
Browse files

RC1

parent faa40b74
Hide whitespace changes
Inline Side-by-side
debian-config-jobs
View file @ aaf06114
...@@ -122,6 +122,20 @@ function jobs () ...@@ -122,6 +122,20 @@ function jobs ()
# Select dynamic or edit static IP address
#
"IP" )
# select default interfaces if there is more than one
select_default_interface
dialog --title " IP address assignment " --colors --backtitle "$BACKTITLE" --help-button --help-label "Cancel" --yes-label "DHCP" --no-label "Static" --yesno "\n\Z1DHCP:\Z0 automatic IP asignment by your router or DHCP server\n\n\Z1Static:\Z0 manually fixed IP address" 9 70
if [[ $? = 0 ]]; then
create_if_config "$DEFAULT_ADAPTER" "$DEFAULT_ADAPTER" "dynamic" > /etc/network/interfaces
elif [[ $? = 1 ]]; then
create_if_config "$DEFAULT_ADAPTER" "$DEFAULT_ADAPTER" "fixed" > /dev/null
ip_editor "$DEFAULT_ADAPTER" "$DEFAULT_ADAPTER" "/etc/network/interfaces"
fi
;;
# Connect to wireless access point # Connect to wireless access point
# #
...@@ -152,7 +166,7 @@ function jobs () ...@@ -152,7 +166,7 @@ function jobs ()
systemctl disable dnsmasq.service >/dev/null 2>&1 systemctl disable dnsmasq.service >/dev/null 2>&1
rm /etc/NetworkManager/conf.d/armbian.conf rm /etc/NetworkManager/conf.d/armbian.conf
ifdown $WIRELESS_ADAPTER 2> /dev/null ifdown $WIRELESS_ADAPTER 2> /dev/null
ln -sf /etc/network/interfaces.default /etc/network/interfaces rm -f /etc/network/interfaces.d/armbian*
sed -i '/^iptables/ d' /etc/rc.local sed -i '/^iptables/ d' /etc/rc.local
iptables -F iptables -F
service network-manager reload service network-manager reload
...@@ -212,9 +226,10 @@ function jobs () ...@@ -212,9 +226,10 @@ function jobs ()
break break
fi fi
dialog --title " Choose Access Point mode for $WIRELESS_ADAPTER " --colors --backtitle "$BACKTITLE" --no-label "Bridge" \ # dialog --title " Choose Access Point mode for $WIRELESS_ADAPTER " --colors --backtitle "$BACKTITLE" --no-label "Bridge" --yes-label "NAT" --yesno "\n\Z1NAT:\Z0 with own DHCP server, out of your primary network\n\n\Z1Bridge:\Z0 wireless clients will use your routers DHCP server" 9 70
--yes-label "NAT" --yesno "\n\Z1NAT:\Z0 with own DHCP server, out of your primary network\n\n\Z1Bridge:\Z0 wireless clients will use your routers DHCP server" 9 70 # response=$?
response=$? # let's remove bridge for this simple configurator
response=0
# select default interfaces if there is more than one # select default interfaces if there is more than one
select_default_interface select_default_interface
...@@ -224,7 +239,7 @@ function jobs () ...@@ -224,7 +239,7 @@ function jobs ()
case $response in case $response in
# bridge # bridge
1) 1)
TEMP_CONF="/etc/network/interfaces.ap.bridge" TEMP_CONF="/etc/network/interfaces.d/armbian.ap.bridge"
sed -i 's/.bridge=.*/bridge=br0/' /etc/hostapd.conf sed -i 's/.bridge=.*/bridge=br0/' /etc/hostapd.conf
if [[ $DEFAULT_ADAPTER == "br0" ]]; then NEW_DEFAULT_ADAPTER="eth0"; else NEW_DEFAULT_ADAPTER="$DEFAULT_ADAPTER"; fi if [[ $DEFAULT_ADAPTER == "br0" ]]; then NEW_DEFAULT_ADAPTER="eth0"; else NEW_DEFAULT_ADAPTER="$DEFAULT_ADAPTER"; fi
...@@ -237,7 +252,7 @@ function jobs () ...@@ -237,7 +252,7 @@ function jobs ()
;; ;;
# NAT # NAT
0) 0)
TEMP_CONF="/etc/network/interfaces.ap.nat" TEMP_CONF="/etc/network/interfaces.d/armbian.ap.nat"
if [[ $(dpkg-query -W -f='${db:Status-Abbrev}\n' dnsmasq 2>/dev/null) != *ii* ]]; then if [[ $(dpkg-query -W -f='${db:Status-Abbrev}\n' dnsmasq 2>/dev/null) != *ii* ]]; then
debconf-apt-progress -- apt-get -qq -y --no-install-recommends install dnsmasq debconf-apt-progress -- apt-get -qq -y --no-install-recommends install dnsmasq
fi fi
...@@ -287,11 +302,9 @@ function jobs () ...@@ -287,11 +302,9 @@ function jobs ()
response=$? response=$?
if [[ $response = 0 ]]; then if [[ $response = 0 ]]; then
mv $TEMP_CONF".tmp" $TEMP_CONF mv $TEMP_CONF".tmp" $TEMP_CONF
ln -sf $TEMP_CONF /etc/network/interfaces #reboot
reboot
fi fi
else else
ln -sf $TEMP_CONF /etc/network/interfaces
ifdown $WIRELESS_ADAPTER 2> /dev/null ifdown $WIRELESS_ADAPTER 2> /dev/null
ifup $WIRELESS_ADAPTER 2> /dev/null ifup $WIRELESS_ADAPTER 2> /dev/null
echo "nameserver 8.8.8.8" > /etc/resolvconf/resolv.conf.d/base echo "nameserver 8.8.8.8" > /etc/resolvconf/resolv.conf.d/base
...@@ -314,7 +327,7 @@ function jobs () ...@@ -314,7 +327,7 @@ function jobs ()
# Edit network settings # Edit network settings
# #
"Network" ) "Advanced" )
dialog --backtitle "$BACKTITLE" --title " Edit ifupdown network configuration /etc/network/interfaces" --no-collapse \ dialog --backtitle "$BACKTITLE" --title " Edit ifupdown network configuration /etc/network/interfaces" --no-collapse \
--ok-label "Save" --editbox /etc/network/interfaces 30 0 2> /etc/network/interfaces.out --ok-label "Save" --editbox /etc/network/interfaces 30 0 2> /etc/network/interfaces.out
[[ $? = 0 ]] && mv /etc/network/interfaces.out /etc/network/interfaces && service network-manager restart && service networking restart [[ $? = 0 ]] && mv /etc/network/interfaces.out /etc/network/interfaces && service network-manager restart && service networking restart
...@@ -455,7 +468,7 @@ function jobs () ...@@ -455,7 +468,7 @@ function jobs ()
;; ;;
# Toggle welcome screen items # Toggle overlay items
# #
"Overlays" ) "Overlays" )
# check if user agree to enter this area # check if user agree to enter this area
...@@ -485,7 +498,7 @@ function jobs () ...@@ -485,7 +498,7 @@ function jobs ()
LISTLENGHT="$(($LIST_CONST+${#MOTD[@]}/2))" LISTLENGHT="$(($LIST_CONST+${#MOTD[@]}/2))"
exec 3>&1 exec 3>&1
selection=$(dialog --backtitle "$BACKTITLE" --title "Toggle motd executing scripts" --clear --cancel-label \ selection=$(dialog --backtitle "$BACKTITLE" --title "Toggle hardware config" --clear --cancel-label \
"Exit" --ok-label "Save" --checklist "\nChoose what you want to enable or disable:\n " \ "Exit" --ok-label "Save" --checklist "\nChoose what you want to enable or disable:\n " \
$LISTLENGHT 70 22 "${MOTD[@]}" 2>&1 1>&3) $LISTLENGHT 70 22 "${MOTD[@]}" 2>&1 1>&3)
exit_status=$? exit_status=$?
......
debian-config-submenu
View file @ aaf06114
...@@ -45,14 +45,16 @@ fi ...@@ -45,14 +45,16 @@ fi
# create interface configuration section # create interface configuration section
# #
function create_if_config() { function create_if_config() {
local address=$(ip -4 addr show dev $1 | awk '/inet/ {print $2}' | cut -d'/' -f1) address=$(ip -4 addr show dev $1 | awk '/inet/ {print $2}' | cut -d'/' -f1)
local mask=$(ifconfig $1 | sed -rn '2s/ .*:(.*)$/\1/p') netmask=$(ifconfig $1 | sed -rn '2s/ .*:(.*)$/\1/p')
local gateway=$(route -n | grep 'UG[ \t]' | awk '{print $2}' | sed -n '1p') gateway=$(route -n | grep 'UG[ \t]' | awk '{print $2}' | sed -n '1p')
echo -e "# armbian-config created"
echo -e "source /etc/network/interfaces.d/*\n"
echo -e "allow-hotplug $2\nno-auto-down $2" echo -e "allow-hotplug $2\nno-auto-down $2"
if grep -q "iface $1 inet dhcp" /etc/network/interfaces; then if [[ "$3" != "fixed" ]]; then
echo -e "iface $2 inet dhcp" echo -e "iface $2 inet dhcp"
else else
echo -e "iface $2 inet static\n\taddress $address\n\tnetmask $mask\n\tgateway $gateway\n\tdns-nameservers 8.8.8.8" echo -e "iface $2 inet static\n\taddress $address\n\tnetmask $netmask\n\tgateway $gateway\n\tdns-nameservers 8.8.8.8"
fi fi
} # } #
...@@ -135,6 +137,28 @@ function description ...@@ -135,6 +137,28 @@ function description
} }
function ip_editor ()
{
exec 3>&1
dialog --title " Static IP configuration" --backtitle "$BACKTITLE" --form "\nAdapter: $1
\n " 12 38 0 \
"Address:" 1 1 "$address" 1 15 15 0 \
"Netmask:" 2 1 "$netmask" 2 15 15 0 \
"Gateway:" 3 1 "$gateway" 3 15 15 0 \
2>&1 1>&3 | {
read -r address;read -r netmask;read -r gateway
if [[ $? = 0 ]]; then
echo -e "# armbian-config created\nsource /etc/network/interfaces.d/*\n\nallow-hotplug $2\nno-auto-down $2\niface $2 inet static\n\taddress $address\n\tnetmask $netmask\n\tgateway $gateway\n\tdns-nameservers 8.8.8.8" > $3
fi
}
}
#-----------------------------------------------------------------------------------------------------------------------------------------# #-----------------------------------------------------------------------------------------------------------------------------------------#
# edit hostapd parameters # edit hostapd parameters
# #
...@@ -366,6 +390,7 @@ function submenu_networking () ...@@ -366,6 +390,7 @@ function submenu_networking ()
{ {
while true; do while true; do
LIST=() LIST=()
LIST+=( "IP" "Select dynamic or edit static IP address" )
HOSTAPDBRIDGE=$(cat /etc/hostapd.conf 2> /dev/null | grep -w "^bridge=br0") HOSTAPDBRIDGE=$(cat /etc/hostapd.conf 2> /dev/null | grep -w "^bridge=br0")
HOSTAPDSTATUS=$(service hostapd status | grep -w active | grep -w running) HOSTAPDSTATUS=$(service hostapd status | grep -w active | grep -w running)
if [[ -n "$HOSTAPDSTATUS" ]]; then if [[ -n "$HOSTAPDSTATUS" ]]; then
...@@ -379,7 +404,7 @@ while true; do ...@@ -379,7 +404,7 @@ while true; do
[[ -n $(nmcli device status | grep wifi | grep -v unavailable) ]] && LIST+=( "WiFi" "Manage wireless networking" ) [[ -n $(nmcli device status | grep wifi | grep -v unavailable) ]] && LIST+=( "WiFi" "Manage wireless networking" )
[[ $(hcitool dev | sed '1d') != "" && -n $(service bluetooth status | grep -w active | grep -w running) ]] && LIST+=( "Bluetooth" "Connect Bluetooth devices" ) [[ $(hcitool dev | sed '1d') != "" && -n $(service bluetooth status | grep -w active | grep -w running) ]] && LIST+=( "Bluetooth" "Connect Bluetooth devices" )
LIST+=( "Network" "Edit /etc/network/interfaces" ) LIST+=( "Advanced" "Edit /etc/network/interfaces" )
# count number of menu items to adjust window sizee # count number of menu items to adjust window sizee
LISTLENGHT="$((11+${#LIST[@]}/2))" LISTLENGHT="$((11+${#LIST[@]}/2))"
......
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