Merge pull request #742 from yast/fix_schema

Fix schema

Rakefile

@@ -29,4 +29,6 @@ task :install do
   make_dir "/var/lib/autoinstall/repository/classes"
   make_dir "/var/lib/autoinstall/autoconf"
   make_dir "/var/lib/autoinstall/tmp"
+  # remove git only readme
+  sh "rm #{Packaging::Configuration::YAST_DIR}/schema/autoyast/rnc/README.md"
 end

package/autoyast2.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Mar 15 13:13:20 UTC 2021 - Josef Reidinger <jreidinger@suse.com>
+
+- Autoyast schema: allow semi-automatic_entry alias for module in
+  semi-automatic entry as it was already documented in autoyast
+  documentation (bsc#1183512)
+- 4.3.72
+
 -------------------------------------------------------------------
 Thu Mar 11 15:49:36 UTC 2021 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 

package/autoyast2.spec

@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.3.71
+Version:        4.3.72
 Release:        0
 Summary:        YaST2 - Automated Installation
 License:        GPL-2.0-only

src/autoyast-rnc/README.md

@@ -0,0 +1,16 @@
+## Relax NG Schema
+
+See [doc/validation.md: Profile Validation](../../doc/validation.md).
+
+### Validating the Schema Itself
+
+(Or, Who will guard the guards themselves?)
+
+See [check_schema.sh](../../check_schema.sh) at the root of this repo,
+which is run as part of a [CI GH Action](../../.github/workflows/ci.yml).
+
+To run it yourself you may need to install the tools:
+
+```sh
+zypper install trang
+```

src/autoyast-rnc/general.rnc

@@ -82,7 +82,8 @@ ask_ok_label = element ok_label { STRING }
 ask_back_label = element back_label { STRING }
 
 semi-automatic = element semi-automatic { LIST, semi-automatic-modules* }
-semi-automatic-modules = element module { STRING_ATTR, ( "networking" | "partitioning" | "scc" ) }
+# allow here both module which is original one and also semi-automatic_entry from documenation (bsc#1183512)
+semi-automatic-modules = element semi-automatic_entry | module { STRING_ATTR, ( "networking" | "partitioning" | "scc" ) }
 
 minimal-configuration = element minimal-configuration { BOOLEAN }