diff options
| author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-11-08 04:17:33 -0200 |
|---|---|---|
| committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-11-08 04:17:33 -0200 |
| commit | 8d9209a81b5ea1390d10f6eb7a4faf54c3be8894 (patch) | |
| tree | 966bf61f52a36d2b9075b350230c6174d925424c | |
| parent | 80b0efbfa956bbf5ef55bcc53d413075811e2340 (diff) | |
fix deprecated mariadb
| -rw-r--r-- | ~coadde/mariadb/PKGBUILD | 6 | ||||
| -rwxr-xr-x | ~coadde/mariadb/mariadbd | 6 | ||||
| -rw-r--r-- | ~coadde/mariadb/my.cnf | 4 | ||||
| -rw-r--r-- | ~coadde/mariadb/mysqld | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/~coadde/mariadb/PKGBUILD b/~coadde/mariadb/PKGBUILD index 7b02c2533..5bfbf9a0f 100644 --- a/~coadde/mariadb/PKGBUILD +++ b/~coadde/mariadb/PKGBUILD @@ -20,8 +20,8 @@ source=("http://mirror.aarnet.edu.au/pub/${_pkgbase}/${pkgbase}-${pkgver}/kvm-ta "${falsename}d" 'my.cnf') md5sums=('7074fa091b3c1489f45a5ddf12cd5e6f' - '2234207625baa29b2ff7d7b4f088abce' - '1c949c0dbea5206af0db14942d9927b6') + 'b9ecca93aaeee9d8375fffb199d9057c' + '1351485633baf9894cfdf7c5bbffd7b5') build() { cd "${srcdir}" @@ -37,7 +37,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc/${falsename} \ -DMYSQL_DATADIR=/var/lib/${falsename} \ - -DMYSQL_UNIX_ADDR=/var/run/${falsename}/${falsename}.sock \ + -DMYSQL_UNIX_ADDR=/run/${falsename}/${falsename}.sock \ -DDEFAULT_CHARSET=utf8 \ -DDEFAULT_COLLATION=utf8_unicode_ci \ -DENABLED_LOCAL_INFILE=ON \ diff --git a/~coadde/mariadb/mariadbd b/~coadde/mariadb/mariadbd index 3ae612096..95986eb1a 100755 --- a/~coadde/mariadb/mariadbd +++ b/~coadde/mariadb/mariadbd @@ -11,7 +11,7 @@ getPID() { case "$1" in start) stat_busy "Starting MariaDB Server" - [ ! -d /var/run/mariadb ] && install -d -g mysql -o mysql /var/run/mariadb &>/dev/null + [ ! -d /run/mariadb ] && install -d -g mysql -o mysql /run/mariadb &>/dev/null if [ -z "$(getPID)" ]; then /usr/bin/mysqld_safe --user=mysql &>/dev/null & if [ $? -gt 0 ]; then @@ -29,7 +29,7 @@ case "$1" in stat_fail exit 1 else - echo $(getPID) > /var/run/mariadb/mariadb.pid + echo $(getPID) > /run/mariadb/mariadb.pid add_daemon mysqld stat_done fi @@ -54,7 +54,7 @@ case "$1" in let timeo=${timeo}-1 done if [ -z "$(getPID)" ]; then - rm -f /var/run/mariadb/mariadb.pid &>/dev/null + rm -f /run/mariadb/mariadb.pid &>/dev/null rm_daemon mysqld stat_done else diff --git a/~coadde/mariadb/my.cnf b/~coadde/mariadb/my.cnf index 9a41b4fc3..387020858 100644 --- a/~coadde/mariadb/my.cnf +++ b/~coadde/mariadb/my.cnf @@ -18,14 +18,14 @@ [client] #password = your_password port = 3306 -socket = /var/run/mysqld/mysqld.sock +socket = /run/mysqld/mysqld.sock # Here follows entries for some specific programs # The MySQL server [mysqld] port = 3306 -socket = /var/run/mysqld/mysqld.sock +socket = /run/mysqld/mysqld.sock datadir = /var/lib/mysql skip-external-locking key_buffer_size = 16M diff --git a/~coadde/mariadb/mysqld b/~coadde/mariadb/mysqld index 1ac88a7cc..4bbddb5a4 100644 --- a/~coadde/mariadb/mysqld +++ b/~coadde/mariadb/mysqld @@ -11,7 +11,7 @@ getPID() { case "$1" in start) stat_busy "Starting MySQL Server" - [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null + [ ! -d /run/mysqld ] && install -d -g mysql -o mysql /run/mysqld &>/dev/null if [ -z "$(getPID)" ]; then /usr/bin/mysqld_safe --user=mysql &>/dev/null & if [ $? -gt 0 ]; then @@ -29,7 +29,7 @@ case "$1" in stat_fail exit 1 else - echo $(getPID) > /var/run/mysqld/mysqld.pid + echo $(getPID) > /run/mysqld/mysqld.pid add_daemon mysqld stat_done fi @@ -54,7 +54,7 @@ case "$1" in let timeo=${timeo}-1 done if [ -z "$(getPID)" ]; then - rm -f /var/run/mysqld/mysqld.pid &>/dev/null + rm -f /run/mysqld/mysqld.pid &>/dev/null rm_daemon mysqld stat_done else |