Merge pull request #122 from yast/review_150511_restrict_tag

[Review] Request from 'schubi2' @ 'yast/yast-autoinstallation/review_150511_restrict_tag'
yast · May 11, 2015 · 69c6dff · 69c6dff
2 parents 0dac4a4 + 3c28488
commit 69c6dff
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri May  8 09:45:27 CEST 2015 - schubi@suse.de
+
+- Added new section "restricts" for ntp configuration
+  (bnc#928987)
+- 3.1.79
+
 -------------------------------------------------------------------
 Wed May  6 11:48:40 CEST 2015 - locilka@suse.com
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           autoyast2
-Version:        3.1.78
+Version:        3.1.79
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -32,7 +32,7 @@ BuildRequires:  yast2-installation-control
 BuildRequires:  libxml2-tools
 # xsltproc for AutoinstClass
 BuildRequires:  libxslt
-BuildRequires:  rubygem(rspec)
+BuildRequires:  rubygem(%{rb_default_ruby_abi}:rspec)
 BuildRequires:  yast2
 BuildRequires:  yast2-storage
 BuildRequires:  yast2-xml

diff --git a/src/include/autoinstall/xml.rb b/src/include/autoinstall/xml.rb
@@ -37,6 +37,7 @@ def profileSetup
           "initrd_modules"           => "initrd_module",
           "nfs_entries"              => "nfs_entry",
           "peers"                    => "peer",
+          "restricts"                => "restrict",
           "netd_conf"                => "conf",
           "raid"                     => "device",
           "hosts"                    => "hosts_entry",