Merge remote-tracking branch 'hagbard/current' into current

* commit 'hagbard/current':
  T201: - set <valueless/> since only create and delete is required
  T201: avoid node.def creation which conflicts with vyatta-cfg-system
  emoved enable and disabled, as per Christians note.
  removed enable and disable, which is not really required.
  T201 implmntation, it depends on the beep pacakge added in vyos-build

3 files changed, 67 insertions, 0 deletions

diff --git a/Makefile b/Makefile
index 84cc8fa90..50710af47 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@ interface_definitions:
 
 	# XXX: delete top level node.def's that now live in other packages
 	rm -f $(TMPL_DIR)/system/node.def
+	rm -f $(TMPL_DIR)/system/options/node.def
 	rm -f $(TMPL_DIR)/service/node.def
 	rm -f $(TMPL_DIR)/service/dns/node.def
 	rm -f $(TMPL_DIR)/protocols/node.def
diff --git a/interface-definitions/beep-on-boot.xml b/interface-definitions/beep-on-boot.xml
new file mode 100644
index 000000000..0853498d1
--- /dev/null
+++ b/interface-definitions/beep-on-boot.xml
@@ -0,0 +1,20 @@
+<?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/>
+            </properties>
+          </leafNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/src/conf_mode/beep_if_fully_booted.py b/src/conf_mode/beep_if_fully_booted.py
new file mode 100755
index 000000000..1311cba62
--- /dev/null
+++ b/src/conf_mode/beep_if_fully_booted.py
@@ -0,0 +1,46 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2018 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+
+import sys
+import subprocess
+
+from vyos.config import Config
+from vyos import ConfigError
+
+def get_config():
+  conf = Config()
+  if not conf.exists('system options beep-if-fully-booted'):
+    return 1
+  else:
+    return 0
+
+def apply(status):
+  if status == 1:
+    rc = subprocess.call(['/bin/systemctl -q disable beep'], shell=True)
+    return rc
+  elif status == 0:
+    rc = subprocess.call(['/bin/systemctl -q enable beep'], shell=True)
+    return rc
+
+if __name__ == '__main__':
+  try:
+    c = get_config()
+    apply(c)
+  except ConfigError as e:
+    print(e)
+    sys.exit(1)