summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
authorzsdc <taras@vyos.io>2019-12-31 00:04:10 +0200
committerzsdc <taras@vyos.io>2019-12-31 00:04:10 +0200
commit7fcbd30b3357a047c57db39d0b07ed797f1392df (patch)
tree9f12afa73557425be1e65cbb3a18d0efaa2fc5f7 /interface-definitions
parentf7eda283b6eefbbc349384c22a1e15a1d24ae384 (diff)
parentc7b0585fa97779fc070f4a4a0fe825eb0729023c (diff)
downloadvyos-1x-7fcbd30b3357a047c57db39d0b07ed797f1392df.tar.gz
vyos-1x-7fcbd30b3357a047c57db39d0b07ed797f1392df.zip
Merge remote-tracking branch 'upstream/current' into T1514
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/beep-on-boot.xml.in21
-rw-r--r--interface-definitions/system-options.xml.in8
2 files changed, 7 insertions, 22 deletions
diff --git a/interface-definitions/beep-on-boot.xml.in b/interface-definitions/beep-on-boot.xml.in
deleted file mode 100644
index 0da7d0de4..000000000
--- a/interface-definitions/beep-on-boot.xml.in
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- beep once the login target has been reached -->
-
-<interfaceDefinition>
- <node name="system">
- <children>
- <node name="options">
- <children>
- <leafNode name="beep-if-fully-booted" owner="${vyos_conf_scripts_dir}/beep_if_fully_booted.py">
- <properties>
- <help>plays sound via system speaker when you can login</help>
- <valueless/>
- <priority>9999</priority>
- </properties>
- </leafNode>
- </children>
- </node>
- </children>
- </node>
-</interfaceDefinition>
diff --git a/interface-definitions/system-options.xml.in b/interface-definitions/system-options.xml.in
index 5fa0635bd..48bc353ab 100644
--- a/interface-definitions/system-options.xml.in
+++ b/interface-definitions/system-options.xml.in
@@ -5,9 +5,15 @@
<node name="options" owner="${vyos_conf_scripts_dir}/system-options.py">
<properties>
<help>System Options</help>
- <priority>400</priority>
+ <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>