From 72c6f7491c5986c68d12cfd66e276930c50b04fc Mon Sep 17 00:00:00 2001 From: James Meyer <james.meyer@operamail.com> Date: Mon, 12 Jan 2009 23:27:16 -0600 Subject: add --skip-resolve-hostnames to mysql startup scripts. --- abs/core-testing/LinHES-config/PKGBUILD | 2 +- abs/core-testing/LinHES-config/restore_default_settings.sh | 14 ++++++++------ abs/core-testing/mysql-clients/PKGBUILD | 2 +- abs/core-testing/mysql/PKGBUILD | 2 +- abs/core-testing/mysql/mysqld | 2 +- abs/core-testing/mythtv/stable/mythdb-initial/PKGBUILD | 2 +- .../mythtv/stable/mythdb-initial/permissions.sql | 2 +- abs/core-testing/runit-scripts/PKGBUILD | 2 +- .../runit-scripts/runitscripts/services/mysql/run | 2 +- 9 files changed, 16 insertions(+), 14 deletions(-) diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index 8114e24..6bc168e 100755 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=1.0 -pkgrel=175 +pkgrel=177 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev ) pkgdesc="Install and configure your system" depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan ) diff --git a/abs/core-testing/LinHES-config/restore_default_settings.sh b/abs/core-testing/LinHES-config/restore_default_settings.sh index 5690f48..46c5fc9 100755 --- a/abs/core-testing/LinHES-config/restore_default_settings.sh +++ b/abs/core-testing/LinHES-config/restore_default_settings.sh @@ -13,6 +13,7 @@ Thistemplate="" declare -i OVERRIDE=0 declare -i EVERYTHING=0 + function CMD_DEFINE () { #add override check if [ x$Thistemplate = xsyssettings -a $OVERRIDE -eq 1 ] @@ -28,21 +29,22 @@ function CMD_DEFINE () { } function SQL_DEFINE () { + thostname=`echo ${hostname}|tr - _` #$1 is the table name if [ $1 = "settings" ] then - ALTERSQL="Alter table temp_${1}_${hostname} add unique ( value )" + ALTERSQL="Alter table temp_${1}_${thostname} add unique ( value )" else ALTERSQL=";" fi - CREATESQL="create table temp_${1}_${hostname} like $1;" - COPY_TMP_SQL="replace into temp_${1}_${hostname} (select * from $1 where hostname=\"$hostname\");" - INSERTSQL="LOAD DATA local INFILE '/tmp/$1.txt' REPLACE INTO TABLE temp_${1}_${hostname} FIELDS TERMINATED BY '\t';" + CREATESQL="create table temp_${1}_${thostname} like $1;" + COPY_TMP_SQL="replace into temp_${1}_${thostname} (select * from $1 where hostname=\"$hostname\");" + INSERTSQL="LOAD DATA local INFILE '/tmp/$1.txt' REPLACE INTO TABLE temp_${1}_${thostname} FIELDS TERMINATED BY '\t';" #INSERTSQL="LOAD DATA local INFILE '$TEMPLATES/$Thistemplate/$1.txt' REPLACE INTO TABLE temp_${1}_${hostname} FIELDS TERMINATED BY '\t';" DROPSQL="delete from $1 where hostname=\"$hostname\";" - COPY_BCK_SQL="replace into $1 (select * from temp_${1}_${hostname} where hostname=\"$hostname\");" - DROP_TABLE="Drop table temp_${1}_${hostname}" + COPY_BCK_SQL="replace into $1 (select * from temp_${1}_${thostname} where hostname=\"$hostname\");" + DROP_TABLE="Drop table temp_${1}_${thostname}" } function ARG_ERR() { diff --git a/abs/core-testing/mysql-clients/PKGBUILD b/abs/core-testing/mysql-clients/PKGBUILD index ecbdcdd..9c8e70b 100644 --- a/abs/core-testing/mysql-clients/PKGBUILD +++ b/abs/core-testing/mysql-clients/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: judd <jvinet@zeroflux.org> pkgname=mysql-clients pkgver=5.0.60 -pkgrel=1 +pkgrel=2 pkgdesc="MySQL client tools" arch=(i686 x86_64) depends=("libmysqlclient>=${pkgver}" 'gcc-libs' 'readline') diff --git a/abs/core-testing/mysql/PKGBUILD b/abs/core-testing/mysql/PKGBUILD index f854e9a..ca31fa7 100644 --- a/abs/core-testing/mysql/PKGBUILD +++ b/abs/core-testing/mysql/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: judd <jvinet@zeroflux.org> pkgname=mysql pkgver=5.0.60 -pkgrel=6 +pkgrel=8 pkgdesc="A fast SQL database server" arch=(i686 x86_64) backup=(etc/my.cnf etc/conf.d/mysqld) diff --git a/abs/core-testing/mysql/mysqld b/abs/core-testing/mysql/mysqld index 8fd1b6c..7621ac1 100755 --- a/abs/core-testing/mysql/mysqld +++ b/abs/core-testing/mysql/mysqld @@ -36,7 +36,7 @@ case "$1" in start) stat_busy "Starting MySQL" if [ -z "$PID" ]; then - /usr/bin/mysqld_safe --datadir=$MYSQLD_ROOT 2>/dev/null >/dev/null & + /usr/bin/mysqld_safe --skip-name-resolve --datadir=$MYSQLD_ROOT 2>/dev/null >/dev/null & if [ $? -gt 0 ]; then stat_fail exit 1 diff --git a/abs/core-testing/mythtv/stable/mythdb-initial/PKGBUILD b/abs/core-testing/mythtv/stable/mythdb-initial/PKGBUILD index 447ff84..367a387 100755 --- a/abs/core-testing/mythtv/stable/mythdb-initial/PKGBUILD +++ b/abs/core-testing/mythtv/stable/mythdb-initial/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythdb-initial pkgver=1 -pkgrel=7 +pkgrel=8 pkgdesc="setup the initial mythtv database for linhes" url="" license="" diff --git a/abs/core-testing/mythtv/stable/mythdb-initial/permissions.sql b/abs/core-testing/mythtv/stable/mythdb-initial/permissions.sql index acb4673..5a36e15 100755 --- a/abs/core-testing/mythtv/stable/mythdb-initial/permissions.sql +++ b/abs/core-testing/mythtv/stable/mythdb-initial/permissions.sql @@ -1,6 +1,6 @@ GRANT ALL ON mythconverg.* TO mythtv@localhost IDENTIFIED BY "mythtv"; -GRANT ALL ON mythconverg.* TO mythtv@"%" IDENTIFIED BY "mythtv"; +GRANT ALL ON mythconverg.* TO mythtv@'%' IDENTIFIED BY "mythtv"; GRANT ALL ON mythconverg.* TO mythtv@myhost IDENTIFIED BY "mythtv"; GRANT FILE ON *.* TO 'mythtv'@'%'; FLUSH PRIVILEGES; diff --git a/abs/core-testing/runit-scripts/PKGBUILD b/abs/core-testing/runit-scripts/PKGBUILD index cc00956..6391972 100755 --- a/abs/core-testing/runit-scripts/PKGBUILD +++ b/abs/core-testing/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=1.8.0 -pkgrel=21 +pkgrel=22 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core-testing/runit-scripts/runitscripts/services/mysql/run b/abs/core-testing/runit-scripts/runitscripts/services/mysql/run index 569230e..10b1c75 100755 --- a/abs/core-testing/runit-scripts/runitscripts/services/mysql/run +++ b/abs/core-testing/runit-scripts/runitscripts/services/mysql/run @@ -26,4 +26,4 @@ if [ ! -e /var/log/mysqld.log ]; then touch /var/log/mysqld.log chown mysql /var/log/mysqld.log fi -exec /usr/sbin/mysqld -u mysql 2>/dev/null >/dev/null +exec /usr/sbin/mysqld --skip-name-resolve -u mysql 2>/dev/null >/dev/null -- cgit v0.12