Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/pr/9'
Browse files Browse the repository at this point in the history
  • Loading branch information
mika committed Apr 2, 2020
2 parents 7dc9ce8 + 1c62e0a commit 1d6c179
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions sbin/netcardconfig
Expand Up @@ -190,10 +190,11 @@ configiface() {
DV=$DEVICENAME
ifdown "${DV}" --force
sleep 3
# wireless config
WLDEVICECOUNT="$(LANG=C LC_MESSAGEWS=C iwconfig "$DV" 2>/dev/null | wc -l)"
# INTERACTIVE=true
if "${INTERACTIVE}" ; then
# Setup wireless options?
if [ $iswireless -gt 0 ] && $DIALOG --yesno "$MESSAGE13" 8 45; then
WLDEVICECOUNT="$(LANG=C LC_MESSAGEWS=C iwconfig "$DV" 2>/dev/null | wc -l)"
ESSID=""
NWID=""
MODE=""
Expand Down Expand Up @@ -433,7 +434,7 @@ configiface() {
read -r IWPRIV <"$TMP" ; rm -f "$TMP"

writeiwline
fi
fi # Setup wireless options?

# Configure VLAN on this interface?
if $DIALOG --defaultno --yesno "$MESSAGE16" 8 45; then
Expand All @@ -445,8 +446,9 @@ configiface() {
DV="vlan$VLAN"
fi
fi
fi
fi # INTERACTIVE=true

# Use DHCP broadcast?
if ("${INTERACTIVE}" && "${DIALOG}" --yesno "${MESSAGE2}" 8 45) || \
(! "${INTERACTIVE}" && [[ "${METHOD}" == 'dhcp' ]]) ; then
if [ -w /etc/network/interfaces ]; then
Expand Down Expand Up @@ -511,7 +513,7 @@ configiface() {
#addauto
fi

fi
fi # Use DHCP broadcast?
echo "Done."
}

Expand Down

0 comments on commit 1d6c179

Please sign in to comment.