summaryrefslogtreecommitdiff
path: root/op-mode-definitions/configure.xml
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-08-03 21:18:25 +0200
committerChristian Poessinger <christian@poessinger.com>2020-08-03 21:18:25 +0200
commit9e6cd018464fcf03a6930116ff5570f68a7c6c45 (patch)
treee4ab926c2d3b7205fc77b97332a3d2e001fdaabf /op-mode-definitions/configure.xml
parent6301c560df544ddac9838d0489941d84748cced3 (diff)
downloadvyos-1x-9e6cd018464fcf03a6930116ff5570f68a7c6c45.tar.gz
vyos-1x-9e6cd018464fcf03a6930116ff5570f68a7c6c45.zip
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.
Diffstat (limited to 'op-mode-definitions/configure.xml')
-rw-r--r--op-mode-definitions/configure.xml19
1 files changed, 17 insertions, 2 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>