3 files changed, 14 insertions, 22 deletions
diff --git a/op-mode-definitions/include/monitor-background.xml.i b/op-mode-definitions/include/monitor-background.xml.i
deleted file mode 100644
index 9931127e3..000000000
--- a/op-mode-definitions/include/monitor-background.xml.i
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- included start from monitor-background.xml.i -->
-<node name="background">
-  <properties>
-    <help>Monitor in background</help>
-  </properties>
-  <children>
-    <node name="start">
-      <properties>
-        <help>Start background monitoring</help>
-      </properties>
-      <command>${vyatta_bindir}/vyatta-monitor-background ${3^^} ${3}</command>
-    </node>
-    <node name="stop">
-      <properties>
-        <help>Stop background monitoring</help>
-      </properties>
-      <command>${vyatta_bindir}/vyatta-monitor-background-stop ${3^^}</command>
-    </node>
-  </children>
-</node>
-<!-- included end -->
diff --git a/op-mode-definitions/include/ospf-common.xml.i b/op-mode-definitions/include/ospf/common.xml.i
index 979ffb07e..c8341bd3e 100644
--- a/op-mode-definitions/include/ospf-common.xml.i
+++ b/op-mode-definitions/include/ospf/common.xml.i
@@ -502,6 +502,7 @@
     </tagNode>
   </children>
 </node>
+#include <include/ospf/graceful-restart.xml.i>
 <node name="interface">
   <properties>
     <help>Show IPv4 OSPF interface information</help>
@@ -556,4 +557,3 @@
   </children>
 </node>
 <!-- included end -->
-
diff --git a/op-mode-definitions/include/ospf/graceful-restart.xml.i b/op-mode-definitions/include/ospf/graceful-restart.xml.i
new file mode 100644
index 000000000..736d8f951
--- /dev/null
+++ b/op-mode-definitions/include/ospf/graceful-restart.xml.i
@@ -0,0 +1,13 @@
+<node name="graceful-restart">
+    <properties>
+      <help>Show IPv4 OSPF Graceful Restart</help>
+    </properties>
+    <children>
+      <leafNode name="helper">
+        <properties>
+          <help>OSPF Graceful Restart helper details</help>
+        </properties>
+        <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      </leafNode>
+    </children>
+  </node>