From 95257cf93eb1c21fd70023913c226636f4e467bb Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 21 Jun 2018 15:46:00 +0200
Subject: lib/load-configuration: source lib/mysql-functions depending on
 wether mysqld is running or not, not on wether we're the master or not

---
 lib/load-configuration | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'lib/load-configuration')

diff --git a/lib/load-configuration b/lib/load-configuration
index 80b8de4..7a6a4f3 100755
--- a/lib/load-configuration
+++ b/lib/load-configuration
@@ -22,10 +22,13 @@ work_dir="${base_dir}/work"
 # if mysqld is not running, we're either on a build slave and don't need
 # lib/mysql-functions or we're on the build master and something is wrong
 # anyway
-if [ "$(hostname)" = 'buildmaster.archlinux32.org' ]; then
-  i_am_the_master=true
+if pgrep -x mysqld >/dev/null 2>&1; then
   # shellcheck source=../lib/mysql-functions
   . "${base_dir}/lib/mysql-functions"
+fi
+
+if [ "$(hostname)" = 'buildmaster.archlinux32.org' ]; then
+  i_am_the_master=true
 else
   i_am_the_master=false
 
-- 
cgit v1.2.3