bin/bootstrap-mysql: make granting of privileges optional

1 files changed, 17 insertions, 15 deletions

diff --git a/bin/bootstrap-mysql b/bin/bootstrap-mysql
index 15712c6..3d0a348 100755
--- a/bin/bootstrap-mysql
+++ b/bin/bootstrap-mysql
@@ -617,20 +617,22 @@ fi
 
   printf 'DELIMITER ;\n'
 
-  printf 'GRANT %s ON %s TO '"'"'buildmaster'"'"'@'"'"'localhost'"'"';\n' \
-    'CREATE ROUTINE' 'buildmaster.*' \
-    'CREATE TEMPORARY TABLES' 'buildmaster.*' \
-    'EXECUTE' 'buildmaster.*' \
-    'RELOAD' '*.*' \
-    'SELECT' 'buildmaster.*' \
-    'SELECT' 'mysql.proc' \
-    'SHOW VIEW' 'buildmaster.*' \
-    'UPDATE' 'buildmaster.*'
-  printf 'GRANT %s ON %s TO '"'"'webserver'"'"'@'"'"'localhost'"'"';\n' \
-    'CREATE TEMPORARY TABLES' 'buildmaster.*' \
-    'EXECUTE' 'buildmaster.*' \
-    'SELECT' 'buildmaster.*' \
-    'SHOW VIEW' 'buildmaster.*'
-  printf 'FLUSH PRIVILEGES;\n'
+  if [ "x$1" != 'x-no-privileges' ]; then
+    printf 'GRANT %s ON %s TO '"'"'buildmaster'"'"'@'"'"'localhost'"'"';\n' \
+      'CREATE ROUTINE' 'buildmaster.*' \
+      'CREATE TEMPORARY TABLES' 'buildmaster.*' \
+      'EXECUTE' 'buildmaster.*' \
+      'RELOAD' '*.*' \
+      'SELECT' 'buildmaster.*' \
+      'SELECT' 'mysql.proc' \
+      'SHOW VIEW' 'buildmaster.*' \
+      'UPDATE' 'buildmaster.*'
+    printf 'GRANT %s ON %s TO '"'"'webserver'"'"'@'"'"'localhost'"'"';\n' \
+      'CREATE TEMPORARY TABLES' 'buildmaster.*' \
+      'EXECUTE' 'buildmaster.*' \
+      'SELECT' 'buildmaster.*' \
+      'SHOW VIEW' 'buildmaster.*'
+    printf 'FLUSH PRIVILEGES;\n'
+  fi
 } | \
   mysql_run_query -u root -p