Bläddra i källkod

Merge pull request #1612 from greg-hellings/fix-mysql-root-pass

Toolset: Set mysql root password more reliably
Hamilton Turner 10 år sedan
förälder
incheckning
a046b4d389
1 ändrade filer med 3 tillägg och 4 borttagningar
  1. 3 4
      toolset/setup/linux/database.sh

+ 3 - 4
toolset/setup/linux/database.sh

@@ -68,10 +68,7 @@ sudo useradd benchmarkdbuser -p benchmarkdbpass
 # MySQL
 ##############################
 echo "Setting up MySQL database"
-sudo sh -c "echo mysql-server mysql-server/root_password_again select secret | debconf-set-selections"
-sudo sh -c "echo mysql-server mysql-server/root_password select secret | debconf-set-selections"
-
-sudo apt-get -y install mysql-server
+sudo DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server
 
 sudo stop mysql
 # disable checking of disk size
@@ -90,6 +87,8 @@ sudo cp usr.sbin.mysqld /etc/apparmor.d/
 sudo /etc/init.d/apparmor reload
 sudo start mysql
 
+# Set root password
+sudo mysqladmin -u root password secret
 # Insert data
 mysql -uroot -psecret < create.sql
 rm create.sql