Skip to content

Commit c8f0eeb

Browse files
committed
Bug#25159791 BASEDIR: COMMAND NOT FOUND ERROR WHILE STARTING SERVER WITH INIT SCRIPTS
(cherry picked from commit 7a39efab8a59ebdcd562fb788bc004ff338796ea)
1 parent 64cc76b commit c8f0eeb

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

packaging/rpm-oel/mysql-systemd-start

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ install_db () {
2222
datadir=$(get_option mysqld datadir "/var/lib/mysql")
2323

2424
# Restore log, dir, perms and SELinux contexts
25-
if [ ! -d "$datadir" -a ! -h "$datadir" -a "x$(basedir "$datadir")" = "x/var/lib" ]; then
25+
if [ ! -d "$datadir" -a ! -h "$datadir" -a "x$(dirname "$datadir")" = "x/var/lib" ]; then
2626
install -d -m 0755 -omysql -gmysql "$datadir" || exit 1
2727
fi
2828
log=/var/log/mysqld.log

packaging/rpm-oel/mysql.init

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ start(){
7676
[ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile"
7777
if [ ! -d "$datadir/mysql" ] ; then
7878
# First, make sure $datadir is there with correct permissions
79-
if [ ! -d "$datadir" -a ! -h "$datadir" -a "x$(basedir "$datadir")" = "x/var/lib" ]; then
79+
if [ ! -d "$datadir" -a ! -h "$datadir" -a "x$(dirname "$datadir")" = "x/var/lib" ]; then
8080
install -d -m0755 -omysql -gmysql "$datadir" || exit 1
8181
fi
82-
if [ ! -h "$datadir" -a "x$(basedir "$datadir")" = "x/var/lib" ]; then
82+
if [ ! -h "$datadir" -a "x$(dirname "$datadir")" = "x/var/lib" ]; then
8383
chown mysql:mysql "$datadir"
8484
chmod 0755 "$datadir"
8585
fi
@@ -99,7 +99,7 @@ start(){
9999
return $ret
100100
fi
101101
fi
102-
if [ ! -h "$datadir" -a "x$(basedir "$datadir")" = "x/var/lib" ]; then
102+
if [ ! -h "$datadir" -a "x$(dirname "$datadir")" = "x/var/lib" ]; then
103103
chown mysql:mysql "$datadir"
104104
chmod 0755 "$datadir"
105105
fi

packaging/rpm-sles/mysql.init

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ install_db () {
5757
logfile=$(get_option mysqld_safe log-error "/var/log/mysql/mysqld.log")
5858

5959
# Restore log, dir, perms and SELinux contexts
60-
if [ ! -d "$datadir" -a ! -h "$datadir" -a "x$(basedir "$datadir")" = "x/var/lib" ]; then
60+
if [ ! -d "$datadir" -a ! -h "$datadir" -a "x$(dirname "$datadir")" = "x/var/lib" ]; then
6161
install -d -m 0755 -omysql -gmysql "$datadir" || return 1
6262
fi
6363

0 commit comments

Comments
 (0)