From 9e6cd018464fcf03a6930116ff5570f68a7c6c45 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 3 Aug 2020 21:18:25 +0200
Subject: op-mode: T2546: use inline shell code for "configure"

Commit 787879ba ("configure: op-mode: move XML here") migrated the op-mode
command "configure" to vyos-1x. The used shell snipped in turn sometimes
complained about: "_vyatta_op_do_key_bindings: command not found".

This is now resolved by moving the code entirely into the node.def file.
---
 op-mode-definitions/configure.xml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'op-mode-definitions/configure.xml')

diff --git a/op-mode-definitions/configure.xml b/op-mode-definitions/configure.xml
index dc534d586..3dd5a0f45 100644
--- a/op-mode-definitions/configure.xml
+++ b/op-mode-definitions/configure.xml
@@ -2,8 +2,23 @@
 <interfaceDefinition>
   <node name="configure">
     <properties>
-      <help>Enter configure mode</help>
+      <help>Enter configuration mode</help>
     </properties>
-    <command>${vyos_op_scripts_dir}/enter_config_mode.sh</command>
+    <command>if [ `id -u` == 0 ]; then
+        echo "You are attempting to enter configuration mode as root."
+        echo "It may have unintended consequences and render your system"
+        echo "unusable until restart."
+        echo "Please do it as an administrator level VyOS user instead."
+    else
+        if grep -q -e '^overlay.*/filesystem.squashfs' /proc/mounts; then
+            echo "WARNING: You are currently configuring a live-ISO environment, changes will not persist until installed"
+        fi
+        history -w
+        export _OFR_CONFIGURE=ok
+        newgrp vyattacfg
+        unset _OFR_CONFIGURE
+        _vyatta_op_do_key_bindings
+        history -r
+    fi</command>
   </node>
 </interfaceDefinition>
-- 
cgit v1.2.3