[packages/mysql] init: add sharedir variable for /usr/share/foo
glen
glen at pld-linux.org
Thu Sep 24 15:13:05 CEST 2015
commit bf9eb59e332976d112a81135a28f216236d2fb81
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Sep 24 16:12:50 2015 +0300
init: add sharedir variable for /usr/share/foo
mysql.init | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/mysql.init b/mysql.init
index 51bb5cf..a118881 100755
--- a/mysql.init
+++ b/mysql.init
@@ -51,6 +51,8 @@ else
exit 0
fi
+sharedir=/usr/share/percona-server
+
action="$1"
# any db cluster as command line argument?
@@ -473,13 +475,13 @@ mysqlinit() {
chown mysql:mysql "$MYSQL_CLUSTER_DIR/mysqldb" "$MYSQL_DATA_DIR" > /dev/null 2>&1
chmod 751 "$MYSQL_CLUSTER_DIR" "$MYSQL_CLUSTER_DIR/mysqldb"
- if [ -f /usr/share/percona-server/mysqld.conf -a ! -f "$MYSQL_CLUSTER_DIR/mysqld.conf" ]; then
+ if [ -f $sharedir/mysqld.conf -a ! -f "$MYSQL_CLUSTER_DIR/mysqld.conf" ]; then
sed -e "
s#\(datadir.*\)=.*#\1= $MYSQL_DATA_DIR#g;
s#\(pid-file.*\)=.*#\1= $MYSQL_PIDFILE#g;
s#\(socket.*\)=.*#\1= $MYSQL_SOCKET#g;
s#@clusterdir@#$MYSQL_CLUSTER_DIR#g;
- " /usr/share/percona-server/mysqld.conf > "$MYSQL_CLUSTER_DIR/mysqld.conf"
+ " $sharedir/mysqld.conf > "$MYSQL_CLUSTER_DIR/mysqld.conf"
chown root:root "$MYSQL_CLUSTER_DIR/mysqld.conf"
chmod 640 "$MYSQL_CLUSTER_DIR/mysqld.conf"
fi
@@ -487,8 +489,8 @@ mysqlinit() {
cat > $MYSQL_DATA_DIR/mysql-init.sql <<-EOF
CREATE DATABASE mysql;
use mysql;
- $(cat /usr/share/percona-server/mysql_system_tables.sql)
- $(sed -e "/@current_hostname/d" /usr/share/percona-server/mysql_system_tables_data.sql)
+ $(cat $sharedir/mysql_system_tables.sql)
+ $(sed -e "/@current_hostname/d" $sharedir/mysql_system_tables_data.sql)
EOF
ok=0
@@ -526,7 +528,7 @@ mysqladmin section. See the manual for more instructions.
END_OF_MSG
show "Filling help tables..."
ok=0
- ( echo "use mysql;"; cat /usr/share/percona-server/fill_help_tables.sql ) | \
+ ( echo "use mysql;"; cat $sharedir/fill_help_tables.sql ) | \
/usr/sbin/mysqld \
--defaults-file=$MYSQL_CLUSTER_DIR/mysqld.conf \
--bootstrap \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/bf9eb59e332976d112a81135a28f216236d2fb81
More information about the pld-cvs-commit
mailing list