mirror.MikroTik/eworm.routeros-scripts
1
0
Fork 0
mirror of https://git.eworm.de/cgit/routeros-scripts synced 2025-07-31 00:04:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

global-config: load overlay automatically

Browse source
This commit is contained in:
Christian Hesse 2021-12-07 15:40:14 +01:00
parent 8f8130775f
commit 1f5cc39b3c
4 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
global-functions
View file

@ -777,11 +777,11 @@
}
:if ($ReloadGlobalConfig = true) do={
$LogPrintExit2 info $0 ("Reloading global configuration and overlay.") false;
$LogPrintExit2 info $0 ("Reloading global configuration.") false;
:do {
/ system script { run global-config; run global-config-overlay; }
/ system script run global-config;
} on-error={
$LogPrintExit2 error $0 ("Reloading global configuration and overlay failed!" . \
$LogPrintExit2 error $0 ("Reloading global configuration failed!" . \
" Syntax error or missing overlay\?") false;
}
}
@ -838,7 +838,7 @@
:local NotificationMessage ("Current configuration on " . $Identity . \
" is out of date. Please update global-config-overlay, then increase " . \
"\$GlobalConfigVersion (currently " . $GlobalConfigVersion . \
") to " . $ExpectedConfigVersion . " and re-run global-config-overlay.");
") to " . $ExpectedConfigVersion . " and re-run global-config.");
$LogPrintExit2 info $0 ($NotificationMessage) false;
:if ([ :len $GlobalConfigChanges ] > 0) do={