Merge 8e8607f into 8347824

yast · May 7, 2020 · e3f5f1e · e3f5f1e
2 parents 8347824 + 8e8607f
commit e3f5f1e
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 23 deletions.
diff --git a/package/yast2-dhcp-server.changes b/package/yast2-dhcp-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu May  7 15:31:15 UTC 2020 - Josef Reidinger <jreidinger@suse.com>
+
+- Autoyast schema: Allow optional types for string and map objects
+  (bsc#1170886)
+- 4.3.0
+
 -------------------------------------------------------------------
 Sat Apr  4 17:06:50 UTC 2020 - Michal Filka <mfilka@suse.com>
 

diff --git a/package/yast2-dhcp-server.spec b/package/yast2-dhcp-server.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-dhcp-server
-Version:        4.2.3
+Version:        4.3.0
 Release:        0
 Summary:        YaST2 - DHCP Server Configuration
 Group:          System/YaST

diff --git a/src/autoyast-rnc/dhcp-server.rnc b/src/autoyast-rnc/dhcp-server.rnc
@@ -2,14 +2,18 @@ default namespace = "http://www.suse.com/1.0/yast2ns"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 namespace config = "http://www.suse.com/1.0/configns"
 
+include "common.rnc"
 
 dhcp-server = element dhcp-server {
-    allowed_interfaces? &
-    element chroot             { "1" | "0" }? &
-    element start_service      { "1" | "0" }? &
-    element use_ldap           { "1" | "0" }? &
-    element other_options      { text } &
-    dhcp-server-settings?
+    MAP,
+    (
+      allowed_interfaces? &
+      element chroot             { STRING_ATTR, ("1" | "0") }? &
+      element start_service      { STRING_ATTR, ("1" | "0") }? &
+      element use_ldap           { STRING_ATTR, ("1" | "0") }? &
+      element other_options      { STRING } &
+      dhcp-server-settings?
+    )
 }
 
 allowed_interfaces = 
@@ -18,23 +22,26 @@ allowed_interfaces =
     allowed_interface*
 }
 
-allowed_interface = element allowed_interface { text }
+allowed_interface = element allowed_interface { STRING }
 
 dhcp-server-settings = element settings {
     LIST,
     dhcp-server-settings_entry*
 }
 
 dhcp-server-settings_entry = element settings_entry {
-    settings_entry_children? &
-    settings_entry_directives? &
+    MAP,
+    (
+      settings_entry_children? &
+      settings_entry_directives? &
 
 
-    element id          { text }? &
-    options?			  &
-    element parent_id   { text }? &
-    element parent_type { text }? &
-    element type        { text }? 
+      element id          { STRING }? &
+      options?			  &
+      element parent_id   { STRING }? &
+      element parent_type { STRING }? &
+      element type        { STRING }? 
+    )
 }
 
 settings_entry_children = element children {
@@ -43,8 +50,11 @@ settings_entry_children = element children {
 }
 
 settings_entry_child = element child {
-    element id   { text }? &
-    element type { text }?
+    MAP,
+    (
+      element id   { STRING }? &
+      element type { STRING }?
+    )
 }
 
 settings_entry_directives = element directives {
@@ -53,9 +63,12 @@ settings_entry_directives = element directives {
 }
 
 settings_entry_directives_listentry = element listentry {
-    element key   { text }? &
-    element type  { text }? &
-    element value { text }?
+    MAP,
+    (
+      element key   { STRING }? &
+      element type  { STRING }? &
+      element value { STRING }?
+    )
 }
 
 options = element options {
@@ -64,7 +77,10 @@ options = element options {
 }
 
 option = element option {
-    element key   { text }? &
-    element type  { text }? &
-    element value { text }?
+    MAP,
+    (
+      element key   { STRING }? &
+      element type  { STRING }? &
+      element value { STRING }?
+    )
 }