Merge pull request #162 from mchf/bnc851769-bridge-type-name

Use correct type name for bridge
yast · Dec 11, 2013 · c577d34 · c577d34
2 parents 06b59a2 + c7acebc
commit c577d34
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.0.10
+3.0.11
diff --git a/library/network/src/modules/NetworkInterfaces.rb b/library/network/src/modules/NetworkInterfaces.rb
@@ -260,7 +260,7 @@ def GetEthTypeFromSysfs(dev)
       elsif FileUtils.Exists(Ops.add(sys_dir_path, "phy80211"))
         return "wlan"
       elsif FileUtils.Exists(Ops.add(sys_dir_path, "bridge"))
-        return "bridge"
+        return "br"
       elsif FileUtils.Exists(Ops.add(sys_dir_path, "bonding"))
         return "bond"
       elsif FileUtils.Exists(Ops.add(sys_dir_path, "tun_flags"))

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Dec 10 11:40:46 UTC 2013 - mfilka@suse.com
+
+- bnc#851769
+  - fixed reading bridge configuration
+  - thanks to Waldemar Spitz <wspitz@uni-bonn.de>
+- 3.0.11
+
 -------------------------------------------------------------------
 Fri Oct 18 10:45:51 UTC 2013 - mfilka@suse.com