summaryrefslogtreecommitdiff
path: root/op-mode-definitions
diff options
context:
space:
mode:
Diffstat (limited to 'op-mode-definitions')
-rw-r--r--op-mode-definitions/configure.xml.in7
-rw-r--r--op-mode-definitions/monitor-log.xml.in4
2 files changed, 8 insertions, 3 deletions
diff --git a/op-mode-definitions/configure.xml.in b/op-mode-definitions/configure.xml.in
index 3dd5a0f45..a711fa4a9 100644
--- a/op-mode-definitions/configure.xml.in
+++ b/op-mode-definitions/configure.xml.in
@@ -11,7 +11,12 @@
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"
+ echo "WARNING: You are currently configuring a live-ISO environment, changes will not persist until installed"
+ else
+ if grep -q -s '1' /tmp/vyos-config-status; then
+ echo "WARNING: There was a config error on boot: saving the configuration now could overwrite data."
+ echo "You may want to check and reload the boot config"
+ fi
fi
history -w
export _OFR_CONFIGURE=ok
diff --git a/op-mode-definitions/monitor-log.xml.in b/op-mode-definitions/monitor-log.xml.in
index 06b1cf129..c577c5a39 100644
--- a/op-mode-definitions/monitor-log.xml.in
+++ b/op-mode-definitions/monitor-log.xml.in
@@ -6,13 +6,13 @@
<properties>
<help>Monitor last lines of messages file</help>
</properties>
- <command>journalctl --no-hostname --follow --boot</command>
+ <command>SYSTEMD_LOG_COLOR=false journalctl --no-hostname --follow --boot</command>
<children>
<node name="color">
<properties>
<help>Output log in a colored fashion</help>
</properties>
- <command>grc journalctl --no-hostname --follow --boot</command>
+ <command>SYSTEMD_LOG_COLOR=false grc journalctl --no-hostname --follow --boot</command>
</node>
<node name="ids">
<properties>