Read ntp.conf again before generating autoinst.xml file

yast · May 21, 2015 · a337998 · a337998
1 parent 06526d1
commit a337998
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 3 deletions.
diff --git a/package/yast2-ntp-client.changes b/package/yast2-ntp-client.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu May 21 13:44:06 CEST 2015 - schubi@suse.de
+
+- AutoYaST (bnc#928987):
+  -- Read ntp.conf again before generating autoinst.xml file
+  (after the ntp rpm has been installed)
+  -- New section "restricts"
+- 3.1.12.1
+
 -------------------------------------------------------------------
 Tue Sep  2 10:00:18 UTC 2014 - cwh@suse.com
 

diff --git a/package/yast2-ntp-client.spec b/package/yast2-ntp-client.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-ntp-client
-Version:        3.1.12
+Version:        3.1.12.1
 Release:        0
 Summary:        YaST2 - NTP Client Configuration
 License:        GPL-2.0+

diff --git a/testsuite/tests/Read.out b/testsuite/tests/Read.out
@@ -6,4 +6,4 @@ Read	.etc.ntp_conf.all $["comment":"", "file":-1, "kind":"section", "name":"", "
 Read	.cron "/etc/cron.d/novell.ntp-synchronize" nil
 Read	.sysconfig.ntp.NTPD_RUN_CHROOTED "yes"
 Return	true
-Return	$["ntp_policy":"", "peers":[$["address":"ntp1", "comment":"", "options":" options1", "type":"server"], $["address":"127.127.1.2", "comment":"", "options":" options_clock", "type":"__clock"], $["address":"ntp2", "comment":"", "options":" options2", "type":"server"], $["address":"peer1", "comment":"", "options":" options_peer", "type":"peer"]], "start_at_boot":false, "start_in_chroot":true, "sync_interval":5, "synchronize_time":false]
+Return	$["ntp_policy":"", "peers":[$["address":"ntp1", "comment":"", "options":" options1", "type":"server"], $["address":"127.127.1.2", "comment":"", "options":" options_clock", "type":"__clock"], $["address":"ntp2", "comment":"", "options":" options2", "type":"server"], $["address":"peer1", "comment":"", "options":" options_peer", "type":"peer"]], "restricts":[], "start_at_boot":false, "start_in_chroot":true, "sync_interval":5, "synchronize_time":false]
diff --git a/testsuite/tests/Write.out b/testsuite/tests/Write.out
@@ -1,6 +1,6 @@
 Return	true
 Read	.etc.ntp_conf.all $["comment":"", "file":-1, "kind":"section", "name":"", "type":-1, "value":[]]
-Write	.etc.ntp_conf.all $["comment":"", "file":-1, "kind":"section", "name":"", "type":-1, "value":[$["comment":"", "kind":"value", "name":"server", "type":0, "value":"ntp1  options1"], $["comment":"", "kind":"value", "name":"server", "type":0, "value":"127.127.1.2  options_clock"], $["comment":"", "kind":"value", "name":"fudge", "type":0, "value":"127.127.1.2 "], $["comment":"", "kind":"value", "name":"server", "type":0, "value":"ntp2  options2"], $["comment":"", "kind":"value", "name":"peer", "type":0, "value":"peer1  options_peer"]]] true
+Write	.etc.ntp_conf.all $["comment":"", "file":-1, "kind":"section", "name":"", "type":-1, "value":[$["comment":"", "kind":"value", "name":"server", "type":0, "value":"ntp1  options1"], $["comment":"", "kind":"value", "name":"server", "type":0, "value":"127.127.1.2  options_clock"], $["comment":"", "kind":"value", "name":"fudge", "type":0, "value":"127.127.1.2 "], $["comment":"", "kind":"value", "name":"server", "type":0, "value":"ntp2  options2"], $["comment":"", "kind":"value", "name":"peer", "type":0, "value":"peer1  options_peer"], $["comment":"", "kind":"value", "name":"restrict", "type":0, "value":"-6  default kod notrap nomodify nopeer noquery"], $["comment":"\n# Local users may interrogate the ntp server more closely.\n", "kind":"value", "name":"restrict", "type":0, "value":"127.0.0.1  "], $["comment":"", "kind":"value", "name":"restrict", "type":0, "value":"::1  "]]] true
 Write	.etc.ntp_conf nil true
 Write	.sysconfig.network.config.NETCONFIG_NTP_POLICY "" true
 Write	.sysconfig.network.config nil true

diff --git a/testsuite/tests/Write.rb b/testsuite/tests/Write.rb
@@ -92,6 +92,26 @@ def main
                 "type"         => "peer"
               }
             ],
+            "restricts"         => [
+              {
+                "mask"         => "",
+                "options"      => "default kod notrap nomodify nopeer noquery",
+                "comment"      => "",
+                "target"       => "-6"
+              },
+              {
+                "mask"         => "",
+                "options"      => "",
+                "comment"      => "\n# Local users may interrogate the ntp server more closely.\n",
+                "target"       => "127.0.0.1"
+              },
+              {
+                "mask"         => "",
+                "options"      => "",
+                "comment"      => "",
+                "target"       => "::1"
+              }
+            ],
             "start_at_boot"   => false,
             "start_in_chroot" => true,
             "configure_dhcp"  => false