Browse code

Merge "Set password irrespective of mysql server version"

Jenkins authored on 2015/01/20 23:24:29
Showing 1 changed files
... ...
@@ -138,10 +138,10 @@ function install_database_mysql {
138 138
     if is_ubuntu; then
139 139
         # Seed configuration with mysql password so that apt-get install doesn't
140 140
         # prompt us for a password upon install.
141
-        cat <<MYSQL_PRESEED | sudo debconf-set-selections
142
-mysql-server-5.1 mysql-server/root_password password $DATABASE_PASSWORD
143
-mysql-server-5.1 mysql-server/root_password_again password $DATABASE_PASSWORD
144
-mysql-server-5.1 mysql-server/start_on_boot boolean true
141
+        sudo debconf-set-selections <<MYSQL_PRESEED
142
+mysql-server mysql-server/root_password password $DATABASE_PASSWORD
143
+mysql-server mysql-server/root_password_again password $DATABASE_PASSWORD
144
+mysql-server mysql-server/start_on_boot boolean true
145 145
 MYSQL_PRESEED
146 146
     fi
147 147