Backport vlan id parsing fix.

yast · Dec 20, 2016 · a631c0d · a631c0d
1 parent f7db4bb
commit a631c0d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/include/network/lan/hardware.rb b/src/include/network/lan/hardware.rb
@@ -810,6 +810,8 @@ def validate_hw(_key, _event)
       true
     end
 
+    VLAN_SIZE = 4 # size of vlanN prefix without number
+
     def storeHW(_key, _event)
       if isNewDevice
         nm = devname_from_hw_dialog
@@ -829,7 +831,7 @@ def storeHW(_key, _event)
         end
         if LanItems.type == "vlan"
           # for vlan devices named vlanN pre-set vlan_id to N, otherwise default to 0
-          LanItems.vlan_id = "#{nm["vlan".size].to_i}"
+          LanItems.vlan_id = nm[VLAN_SIZE..-1]
         end
       end