From 1f5cc39b3cb388e69e479d8b2b1a774c2abde37d Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 7 Dec 2021 15:40:14 +0100
Subject: global-config: load overlay automatically

---
 global-functions | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'global-functions')

diff --git a/global-functions b/global-functions
index ba6419d..b313b70 100644
--- a/global-functions
+++ b/global-functions
@@ -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={
-- 
cgit v1.2.3-54-g00ecf