Merge branch 'SLE-12-SP3'

yast · Nov 28, 2017 · 6066173 · 6066173
2 parents 3370825 + e2d188d
commit 6066173
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/library/network/src/modules/NetworkInterfaces.rb b/library/network/src/modules/NetworkInterfaces.rb
@@ -780,7 +780,9 @@ def adapt_old_config!
     # @param [String] device name
     # @param [Hash] ifcfg a map with netconfig (ifcfg) configuration
     def add_device(device, ifcfg)
-      devtype = GetTypeFromIfcfg(ifcfg) || GetType(device)
+      # if possible use dev type as available in /sys otherwise use ifcfg config
+      # as a fallback for device type detection
+      devtype = GetTypeFromIfcfgOrName(device, ifcfg)
       @Devices[devtype] ||= {}
       @Devices[devtype][device] = ifcfg
     end

diff --git a/library/network/testsuite/tests/NetworkInterfaces2.out b/library/network/testsuite/tests/NetworkInterfaces2.out
@@ -37,6 +37,8 @@ Dir	.network.value."eth0.3": ["BOOTPROTO", "ETHERDEVICE", "STARTMODE"]
 Read	.network.value."eth0.3".BOOTPROTO "dhcp"
 Read	.network.value."eth0.3".ETHERDEVICE "eth0"
 Read	.network.value."eth0.3".STARTMODE "manual"
+Read	.target.stat "/sys/class/net/eth0.3/type" nil
+Read	.target.string "/sys/class/net/eth0.3/type" nil
 Dir	.network.value."eth5": ["BOOTPROTO", "STARTMODE"]
 Read	.network.value."eth5".BOOTPROTO "dhcp"
 Read	.network.value."eth5".STARTMODE "manual"
@@ -112,6 +114,8 @@ Read	.network.value."myvlantoo".BOOTPROTO "dhcp"
 Read	.network.value."myvlantoo".ETHERDEVICE "eth0"
 Read	.network.value."myvlantoo".STARTMODE "manual"
 Read	.network.value."myvlantoo".VLAN_ID "2"
+Read	.target.stat "/sys/class/net/myvlantoo/type" nil
+Read	.target.string "/sys/class/net/myvlantoo/type" nil
 Dir	.network.value."ppp5": ["BOOTPROTO", "STARTMODE"]
 Read	.network.value."ppp5".BOOTPROTO "dhcp"
 Read	.network.value."ppp5".STARTMODE "manual"
@@ -126,10 +130,14 @@ Dir	.network.value."virtlan4": ["BOOTPROTO", "ETHERDEVICE", "STARTMODE"]
 Read	.network.value."virtlan4".BOOTPROTO "dhcp"
 Read	.network.value."virtlan4".ETHERDEVICE "eth0"
 Read	.network.value."virtlan4".STARTMODE "manual"
+Read	.target.stat "/sys/class/net/virtlan4/type" nil
+Read	.target.string "/sys/class/net/virtlan4/type" nil
 Dir	.network.value."vlan3": ["BOOTPROTO", "ETHERDEVICE", "STARTMODE"]
 Read	.network.value."vlan3".BOOTPROTO "dhcp"
 Read	.network.value."vlan3".ETHERDEVICE "eth0"
 Read	.network.value."vlan3".STARTMODE "manual"
+Read	.target.stat "/sys/class/net/vlan3/type" nil
+Read	.target.string "/sys/class/net/vlan3/type" nil
 Return	true
 Dump	all=$["arc":$["arc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "atm":$["atm5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ci":$["ci5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ctc":$["ctc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "dummy":$["dummy5":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "escon":$["escon5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "eth":$["eth5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "eth6":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.255.255.255", "PREFIXLEN":"32", "STARTMODE":"manual"], "eth7":$["STARTMODE":"manual"], "eth8":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth9":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "fddi":$["fddi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hippi":$["hippi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hsi":$["hsi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ippp":$["ippp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "iucv":$["iucv5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "lo":$["lo":$["BROADCAST":"127.255.255.255", "IPADDR":"127.0.0.1", "NETMASK":"255.0.0.0", "NETWORK":"127.0.0.0", "PREFIXLEN":"8", "STARTMODE":"auto"]], "mynet":$["mynet0":$["BOOTPROTO":"dhcp", "STARTMODE":"auto"]], "myri":$["myri5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ppp":$["ppp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "tr":$["tr5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "vlan":$["eth0.3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "myvlantoo":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual", "VLAN_ID":"2"], "virtlan4":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "vlan3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"]]]
 Dump	NetworkInterfaces::Write

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Nov 28 09:50:05 UTC 2017 - mfilka@suse.com
+
+- bnc#956755, bnc#1061306 (mfilka)
+  - fixed storing device information to avoid incorrect "not found"
+    states when querying NetworkInterfaces subsequently
+- 4.0.18
+
 -------------------------------------------------------------------
 Fri Nov 24 11:42:49 UTC 2017 - knut.anderssen@suse.com
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        4.0.17
+Version:        4.0.18
 Release:        0
 Summary:        YaST2 - Main Package
 License:        GPL-2.0