From fa0bed331670447bce285acbabfb009139efd5bc Mon Sep 17 00:00:00 2001
From: Honza Horak <hhorak@redhat.com>
Date: Wed, 18 Jul 2018 00:03:18 +0200
Subject: [PATCH] Fix scripts after moving mysqld back to /usr/libexec

---
 mysql-prepare-db-dir.sh | 2 +-
 mysql.service.in        | 2 +-
 mysql@.service.in       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mysql-prepare-db-dir.sh b/mysql-prepare-db-dir.sh
index 65726bd..46cf636 100644
--- a/mysql-prepare-db-dir.sh
+++ b/mysql-prepare-db-dir.sh
@@ -94,7 +94,7 @@ if should_initialize "$datadir" ; then
 
     # Now create the database
     echo "Initializing @NICE_PROJECT_NAME@ database"
-    @bindir@/mysqld --initialize-insecure --datadir="$datadir" --user="$myuser"
+    @libexecdir@/mysqld --initialize-insecure --datadir="$datadir" --user="$myuser"
     ret=$?
     if [ $ret -ne 0 ] ; then
         echo "Initialization of @NICE_PROJECT_NAME@ database failed." >&2
diff --git a/mysql.service.in b/mysql.service.in
index 743af60..4a7c295 100644
--- a/mysql.service.in
+++ b/mysql.service.in
@@ -39,7 +39,7 @@ ExecStartPre=@libexecdir@/mysql-check-socket
 ExecStartPre=@libexecdir@/mysql-prepare-db-dir %n
 # Note: we set --basedir to prevent probes that might trigger SELinux alarms,
 # per bug #547485
-ExecStart=@bindir@/mysqld --basedir=@prefix@
+ExecStart=@libexecdir@/mysqld --basedir=@prefix@
 ExecStartPost=@libexecdir@/mysql-check-upgrade
 ExecStopPost=@libexecdir@/mysql-wait-stop
 
diff --git a/mysql@.service.in b/mysql@.service.in
index ec0004f..554f0ba 100644
--- a/mysql@.service.in
+++ b/mysql@.service.in
@@ -39,7 +39,7 @@ ExecStartPre=@libexecdir@/mysql-check-socket --defaults-group-suffix=.%I
 ExecStartPre=@libexecdir@/mysql-prepare-db-dir --defaults-group-suffix=.%I %n
 # Note: we set --basedir to prevent probes that might trigger SELinux alarms,
 # per bug #547485
-ExecStart=@bindir@/mysqld --defaults-group-suffix=.%I --basedir=@prefix@
+ExecStart=@libexecdir@/mysqld --defaults-group-suffix=.%I --basedir=@prefix@
 ExecStartPost=@libexecdir@/mysql-check-upgrade --defaults-group-suffix=.%I
 ExecStopPost=@libexecdir@/mysql-wait-stop --defaults-group-suffix=.%I