summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--op-mode-definitions/configure.xml19
-rwxr-xr-xsrc/op_mode/enter_config_mode.sh18
2 files changed, 17 insertions, 20 deletions
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>
diff --git a/src/op_mode/enter_config_mode.sh b/src/op_mode/enter_config_mode.sh
deleted file mode 100755
index 082800ce4..000000000
--- a/src/op_mode/enter_config_mode.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-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