X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmysql;h=cd2d491f0bb1cc27deb0ef5399d3c3af8ad9bce0;hb=8b441b16e54bb7a65f70794ab25b95fd4f18fba2;hp=4ac631b574bf9d2836b52d45c17246662d0571c2;hpb=1645c0c8572abe98f4d92d951ad3482b15cd4db4;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/mysql b/handlers/mysql
index 4ac631b..cd2d491 100644
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -51,13 +51,16 @@ fi
 # If needed, make sure that the specified vserver exists and is running.
 if [ $usevserver ]
 then
-	info "examining vserver '$vsname'"
+	info "Examining vserver '$vsname'"
 	# does it exist ?
 	vroot="$VROOTDIR/$vsname"
 	[ -d $vroot ] || fatal "vserver '$vsname' does not exist at '$vroot'"
 	# is it running ?
-	running=`$VSERVERINFO $vsname RUNNING`
-	[ $running = 1 ] || fatal "vserver $vsname is not running."
+	$VSERVERINFO -q $vsname RUNNING
+	if [ $? -ne 0 ]
+	then
+		fatal "vserver $vsname is not running."
+	fi
 fi
 	
 # create backup dirs, the vroot variable will be empty if no vsname was specified
@@ -95,7 +98,7 @@ fi
 
 defaultsfile=""
 if [ "$dbusername" != "" -a "$dbpassword" != "" ]; then
-	home=`grep '^root:' /etc/passwd | awk -F: '{print $6}'`
+	home=`getent passwd "root" | awk -F: '{print $6}'`
 	[ -d $home ] || fatal "Can't find root's home directory ($home)."
 	mycnf="$home/.my.cnf"
 	if [ -f $mycnf ]; then