Merge branch 'SLE-12-GA' into relaxng-compilable-m

Conflicts: package/yast2-network.changes package/yast2-network.spec
yast · Oct 8, 2015 · ceec2e4 · ceec2e4
2 parents 7571411 + 9244386
commit ceec2e4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Oct  8 12:02:44 UTC 2015 - mvidner@suse.com
+
+- Fixed "Relax-NG parser error : Some defines for ipv6_forward
+  needs the combine attribute" when checking validity
+  of any AutoYaST profile (bsc#948206).
+- 3.1.133
+
 -------------------------------------------------------------------
 Tue Oct  6 16:44:44 UTC 2015 - mfilka@suse.com
 

diff --git a/package/yast2-network.spec b/package/yast2-network.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        3.1.132
+Version:        3.1.133
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/autoyast-rnc/networking.rnc b/src/autoyast-rnc/networking.rnc
@@ -221,16 +221,12 @@ dhclient_hostname_option = element dhclient_hostname_option { text }
 
 routing =
   element routing {
-    ip_forward? &
-    ipv4_forward? &
-    ipv6_forward? &
+    element ip_forward   { BOOLEAN }? &
+    element ipv4_forward { BOOLEAN }? &
+    element ipv6_forward { BOOLEAN }? &
     routes?
   }
 
-ip_forward = element ip_forward { BOOLEAN }
-ipv4_forward = element ipv4_forward { BOOLEAN }
-ipv6_forward = element ipv6_forward { BOOLEAN }
-
 routes =
   element routes {
     LIST,