summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Callaghan <dcallagh@redhat.com>2011-08-04 09:58:06 +1000
committerDan Callaghan <dcallagh@redhat.com>2011-08-04 09:59:15 +1000
commit139e1e1d9ecf030bf8cc8ec18f67a5363f5c150c (patch)
treed78bb48df25eb3e4ab03c55631f9e99c834c8557
parent0a6d5c6aeb23c2cc68546ec7036fd7064d6a64a1 (diff)
/distribution/beaker/setup: MYSQL_EXTRA_CONFIG env varbeaker-distribution-beaker-setup-1_1-66
-rwxr-xr-xTasks/distribution/beaker/setup/runtest.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/Tasks/distribution/beaker/setup/runtest.sh b/Tasks/distribution/beaker/setup/runtest.sh
index 605e69b..78caea4 100755
--- a/Tasks/distribution/beaker/setup/runtest.sh
+++ b/Tasks/distribution/beaker/setup/runtest.sh
@@ -301,7 +301,13 @@ function Inventory()
InstallInventory$SOURCE
# Backup /etc/my.cnf and make INNODB the default engine.
cp /etc/my.cnf /etc/my.cnf-orig
- cat /etc/my.cnf-orig | awk '{print $1}; /\[mysqld\]/ {print "default-storage-engine=INNODB"}' | awk '{print$1}; /\[mysqld\]/ {print "max_allowed_packet=50M" }' > /etc/my.cnf
+ cat /etc/my.cnf-orig | awk '
+ {print $1};
+ /\[mysqld\]/ {
+ print "default-storage-engine=INNODB";
+ print "max_allowed_packet=50M";
+ print ENVIRON["MYSQL_EXTRA_CONFIG"];
+ }' > /etc/my.cnf
#
service mysqld start
estatus_fail "**** Failed to start mysqld ****"