From 150401fa4c0a393ca496e188eeb08f9ac3844a6a Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 21 Mar 2021 08:24:45 +0100
Subject: ntp: T3416: fix op-mode commands when running inside VRF

When NTP is executed inside a VRF context, we also must execute the op-mode
commands inside the given VRF.

This is a workaround until the op-mode programming library from T3402 is
available.

(cherry picked from commit f411351baef67740b76e800161fe55f495c4bd92)
---
 op-mode-definitions/show-ntp.xml.in | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/show-ntp.xml.in b/op-mode-definitions/show-ntp.xml.in
index b7f0acdf8..01f4477d8 100644
--- a/op-mode-definitions/show-ntp.xml.in
+++ b/op-mode-definitions/show-ntp.xml.in
@@ -6,7 +6,7 @@
         <properties>
           <help>Show peer status of NTP daemon</help>
         </properties>
-        <command>if ps -C ntpd &amp;&gt;/dev/null; then ntpq -n -c peers; else echo NTP daemon disabled; fi</command>
+        <command>${vyos_op_scripts_dir}/show_ntp.sh --basic</command>
         <children>
           <tagNode name="server">
             <properties>
@@ -15,15 +15,14 @@
                 <script>${vyos_completion_dir}/list_ntp_servers.sh</script>
               </completionHelp>
             </properties>
-            <command>/usr/sbin/ntpdate -q "$4"</command>
+            <command>${vyos_op_scripts_dir}/show_ntp.sh --server "$4"</command>
           </tagNode>
           <node name="info">
             <properties>
               <help>Show NTP operational summary</help>
             </properties>
-            <command>if ps -C ntpd &amp;&gt;/dev/null; then ntpq -n -c sysinfo; ntpq -n -c kerninfo; else echo NTP daemon disabled; fi</command>
-        </node>
-
+            <command>${vyos_op_scripts_dir}/show_ntp.sh --info</command>
+          </node>
         </children>
       </node>
     </children>
-- 
cgit v1.2.3