summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xabs/core-testing/LinHES-config/PKGBUILD2
-rwxr-xr-xabs/core-testing/LinHES-config/restore_default_settings.sh14
-rw-r--r--abs/core-testing/linhes-live/PKGBUILD2
-rw-r--r--abs/core-testing/linhes-live/etc/live-shutdown6
-rw-r--r--abs/core-testing/mysql-clients/PKGBUILD2
-rw-r--r--abs/core-testing/mysql/PKGBUILD2
-rwxr-xr-xabs/core-testing/mysql/mysqld2
-rwxr-xr-xabs/core-testing/mythtv/stable/mythdb-initial/PKGBUILD2
-rwxr-xr-xabs/core-testing/mythtv/stable/mythdb-initial/permissions.sql2
-rwxr-xr-xabs/core-testing/runit-scripts/PKGBUILD2
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/mysql/run2
11 files changed, 21 insertions, 17 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/linhes-live/PKGBUILD b/abs/core-testing/linhes-live/PKGBUILD
index b0da16a..29de17e 100644
--- a/abs/core-testing/linhes-live/PKGBUILD
+++ b/abs/core-testing/linhes-live/PKGBUILD
@@ -2,7 +2,7 @@
# 2008.09.25
pkgname=linhes-live
pkgver=5.3.3
-pkgrel=15
+pkgrel=17
pkgdesc="LinHes compulsory components for the Live System."
url="http://KnoppMyth.net"
diff --git a/abs/core-testing/linhes-live/etc/live-shutdown b/abs/core-testing/linhes-live/etc/live-shutdown
index b105975..b6a8378 100644
--- a/abs/core-testing/linhes-live/etc/live-shutdown
+++ b/abs/core-testing/linhes-live/etc/live-shutdown
@@ -38,6 +38,7 @@ f_swapoff ()
f_remountro ()
{
bootdev=`cat /.livesys/bootdevice`
+ echo "Boot device was $bootdev"
#bootdev=`basename $bootdev`
for i in `ls /dev/cd/*`
do
@@ -45,15 +46,16 @@ f_remountro ()
if [ x$cdrom = x$bootdev ]
then
ejectdev=$cdrom
+ break
fi
- break
+
done
lspci |grep -q VMware
if [ ! $? = 0 ]
then
if [ -n "${ejectdev}" ]
then
- echo "Ejecting CD"
+ echo "Ejecting CD $ejectdev"
eject ${ejectdev}
echo "========================================"
echo "Tray will retract after 10 seconds"
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
generated by cgit v0.12 at 2024-11-10 12:44:03 (GMT)