From 193323ba5d2f0318ceb81b3969c0181ba3125cf2 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 21 Nov 2020 00:34:25 +0100
Subject: system: T3078: rename "system options" -> "system option"

By design a CLI node should not be named by its plural but rather describe it
as singular.
---
 interface-definitions/system-option.xml.in  | 120 ++++++++++++++++++++++++++++
 interface-definitions/system-options.xml.in | 120 ----------------------------
 2 files changed, 120 insertions(+), 120 deletions(-)
 create mode 100644 interface-definitions/system-option.xml.in
 delete mode 100644 interface-definitions/system-options.xml.in

(limited to 'interface-definitions')

diff --git a/interface-definitions/system-option.xml.in b/interface-definitions/system-option.xml.in
new file mode 100644
index 000000000..26b78c8a4
--- /dev/null
+++ b/interface-definitions/system-option.xml.in
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="system">
+    <children>
+      <node name="option" owner="${vyos_conf_scripts_dir}/system-option.py">
+        <properties>
+          <help>System Options</help>
+          <priority>9999</priority>
+        </properties>
+        <children>
+          <leafNode name="ctrl-alt-delete">
+            <properties>
+              <help>System action on Ctrl-Alt-Delete keystroke</help>
+              <completionHelp>
+                <list>ignore reboot poweroff</list>
+              </completionHelp>
+              <valueHelp>
+                <format>ignore</format>
+                <description>Ignore key sequence</description>
+              </valueHelp>
+              <valueHelp>
+                <format>reboot</format>
+                <description>Reboot system</description>
+              </valueHelp>
+              <valueHelp>
+                <format>poweroff</format>
+                <description>Poweroff system</description>
+              </valueHelp>
+              <constraint>
+                <regex>^(ignore|reboot|poweroff)$</regex>
+              </constraint>
+              <constraintErrorMessage>Must be ignore, reboot, or poweroff</constraintErrorMessage>
+            </properties>
+           </leafNode>
+           <leafNode name="keyboard-layout">
+             <properties>
+               <help>System keyboard layout, type ISO2</help>
+               <completionHelp>
+                 <list>us fr de fi no dk</list>
+               </completionHelp>
+               <valueHelp>
+                 <format>us</format>
+                 <description>United States of America</description>
+               </valueHelp>
+               <valueHelp>
+                 <format>fr</format>
+                 <description>France</description>
+               </valueHelp>
+               <valueHelp>
+                 <format>de</format>
+                 <description>Germany</description>
+               </valueHelp>
+               <valueHelp>
+                 <format>fi</format>
+                 <description>Finland</description>
+               </valueHelp>
+               <valueHelp>
+                 <format>no</format>
+                 <description>Norway</description>
+               </valueHelp>
+               <valueHelp>
+                 <format>dk</format>
+                 <description>Denmark</description>
+               </valueHelp>
+             </properties>
+             <defaultValue>us</defaultValue>
+           </leafNode>
+           <leafNode name="performance">
+            <properties>
+              <help>Tune system performance</help>
+              <completionHelp>
+                <list>throughput latency</list>
+              </completionHelp>
+              <valueHelp>
+                <format>throughput</format>
+                <description>Tune for maximum network throughput</description>
+              </valueHelp>
+              <valueHelp>
+                <format>latency</format>
+                <description>Tune for low network latency</description>
+              </valueHelp>
+              <constraint>
+                <regex>^(throughput|latency)$</regex>
+              </constraint>
+            </properties>
+           </leafNode>
+           <node name="http-client">
+             <properties>
+               <help>Global options used for HTTP client</help>
+             </properties>
+             <children>
+               #include <include/source-interface.xml.i>
+               #include <include/source-address-ipv4-ipv6.xml.i>
+             </children>
+           </node>
+           <leafNode name="reboot-on-panic">
+             <properties>
+               <help>Reboot system on kernel panic</help>
+               <valueless/>
+             </properties>
+           </leafNode>
+           <node name="ssh-client">
+             <properties>
+               <help>Global options used for SSH client</help>
+             </properties>
+             <children>
+               #include <include/source-address-ipv4-ipv6.xml.i>
+             </children>
+           </node>
+           <leafNode name="startup-beep">
+             <properties>
+               <help>plays sound via system speaker when you can login</help>
+               <valueless/>
+             </properties>
+           </leafNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/interface-definitions/system-options.xml.in b/interface-definitions/system-options.xml.in
deleted file mode 100644
index 12e4044af..000000000
--- a/interface-definitions/system-options.xml.in
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="system">
-    <children>
-      <node name="options" owner="${vyos_conf_scripts_dir}/system-options.py">
-        <properties>
-          <help>System Options</help>
-          <priority>9999</priority>
-        </properties>
-        <children>
-          <leafNode name="beep-if-fully-booted">
-            <properties>
-              <help>plays sound via system speaker when you can login</help>
-              <valueless/>
-            </properties>
-          </leafNode>
-          <leafNode name="ctrl-alt-del-action">
-            <properties>
-              <help>Ctrl-Alt-Delete action</help>
-              <completionHelp>
-                <list>ignore reboot poweroff</list>
-              </completionHelp>
-              <valueHelp>
-                <format>ignore</format>
-                <description>Ignore Ctrl-Alt-Delete</description>
-              </valueHelp>
-              <valueHelp>
-                <format>reboot</format>
-                <description>Reboot VyOS</description>
-              </valueHelp>
-              <valueHelp>
-                <format>poweroff</format>
-                <description>Poweroff VyOS</description>
-              </valueHelp>
-              <constraint>
-                <regex>^(ignore|reboot|poweroff)$</regex>
-              </constraint>
-              <constraintErrorMessage>Must be ignore, reboot, or poweroff</constraintErrorMessage>
-            </properties>
-           </leafNode>
-          <leafNode name="performance">
-            <properties>
-              <help>Tune system performance</help>
-              <completionHelp>
-                <list>throughput latency</list>
-              </completionHelp>
-              <valueHelp>
-                <format>throughput</format>
-                <description>Tune for maximum network throughput</description>
-              </valueHelp>
-              <valueHelp>
-                <format>latency</format>
-                <description>Tune for low network latency</description>
-              </valueHelp>
-              <constraint>
-                <regex>^(throughput|latency)$</regex>
-              </constraint>
-            </properties>
-           </leafNode>
-           <node name="http-client">
-             <properties>
-               <help>Global options used for HTTP client</help>
-             </properties>
-             <children>
-               #include <include/source-interface.xml.i>
-               #include <include/source-address-ipv4-ipv6.xml.i>
-             </children>
-           </node>
-           <leafNode name="reboot-on-panic">
-             <properties>
-               <help>Reboot system on kernel panic</help>
-               <valueless/>
-             </properties>
-           </leafNode>
-           <node name="ssh-client">
-             <properties>
-               <help>Global options used for SSH client</help>
-             </properties>
-             <children>
-               #include <include/source-address-ipv4-ipv6.xml.i>
-             </children>
-           </node>
-           <leafNode name="keyboard-layout">
-             <properties>
-               <help>System keyboard layout, type ISO2</help>
-               <completionHelp>
-                 <list>us fr de fi no dk</list>
-               </completionHelp>
-               <valueHelp>
-                 <format>us</format>
-                 <description>United States of America</description>
-               </valueHelp>
-               <valueHelp>
-                 <format>fr</format>
-                 <description>France</description>
-               </valueHelp>
-               <valueHelp>
-                 <format>de</format>
-                 <description>Germany</description>
-               </valueHelp>
-               <valueHelp>
-                 <format>fi</format>
-                 <description>Finland</description>
-               </valueHelp>
-               <valueHelp>
-                 <format>no</format>
-                 <description>Norway</description>
-               </valueHelp>
-               <valueHelp>
-                 <format>dk</format>
-                 <description>Denmark</description>
-               </valueHelp>
-             </properties>
-             <defaultValue>us</defaultValue>
-           </leafNode>
-        </children>
-      </node>
-    </children>
-  </node>
-</interfaceDefinition>
-- 
cgit v1.2.3