From: Michael Prokop <mika@grml.org>
Date: Fri, 25 May 2018 09:35:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/3'
X-Git-Tag: v0.10.0~7
X-Git-Url: http://git.grml.org/?p=grml-network.git;a=commitdiff_plain;h=597006195c1c3d6336fd71c36d27b605ea569f81

Merge remote-tracking branch 'origin/pr/3'
---

597006195c1c3d6336fd71c36d27b605ea569f81
diff --cc sbin/netcardconfig
index 83cac2b,dca975a..d85404f
--- a/sbin/netcardconfig
+++ b/sbin/netcardconfig
@@@ -426,9 -431,9 +436,9 @@@ configiface() 
          /^\W$/{if(blank==0){lastblank=1}else{lastblank=0}{blank=1}}
          /\w/{blank=0;lastblank=0}
          {if(!(found+lastblank)){print}}
-         END{print "iface '"$DV"' inet dhcp"}' \
+         END{print "iface '"$DV"' inet dhcp";if("'"$PDV"'"!=""){print "\tvlan-raw-device '"$PDV"'"}}' \
          /etc/network/interfaces >"$TMP"
 -      echo -e "$IWOURLINE" >> $TMP
 +      echo -e "$IWOURLINE" >> "$TMP"
        #echo -e "\n\n" >> $TMP
        cat "$TMP" >/etc/network/interfaces
        rm -f "$TMP"
@@@ -501,6 -509,13 +511,8 @@@ MESSAGE10="Please enter Nameserver(s)
  MESSAGE13="Setup wireless options?"
  MESSAGE14="Failed to bring up the interface, would you like to reconfigure it?"
  MESSAGE15="Interface enabled, do you want it auto enabled at boot?"
+ MESSAGE16="Configure VLAN on this interface?"
+ MESSAGE17="Please enter VLAN id for"
 -MESSAGEW0="No wireless network card found."
 -MESSAGEW1="Configuration of wireless parameters for"
 -MESSAGEW3="Please configure IP parameters of the interface first"
  MESSAGEW4="Enter the ESSID for"
  MESSAGEW5="\n\n\n(empty for 'any', not recommended !)\n"
  MESSAGEW6="Enter the NWID (cell identifier)\nfor"