From 1e59a18f90219e23983f7c01385dc33ce8e96653 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 18 Jan 2012 15:21:11 +0000
Subject: [PATCH] Only use mysqladmin authentication if we have supplied a root
 password

svn path=/nixos/trunk/; revision=31632
---
 modules/services/databases/mysql.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index b4060d0cfa3..2c35c13255e 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -215,7 +215,7 @@ in
             fi
           '';
 
-        postStop = "${mysql}/bin/mysqladmin --user=root --password=\"$(cat ${cfg.rootPassword})\" shutdown";
+        postStop = "${mysql}/bin/mysqladmin ${optionalString (cfg.rootPassword != null) "--user=root --password=\"$(cat ${cfg.rootPassword})\""} shutdown";
         
         # !!! Need a postStart script to wait until mysqld is ready to
         # accept connections.