X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmysql;h=55bfb25be0de184e9b4e1b897053d708e4eac19b;hb=d1632bb0f5d12c734344d5f90221d75200f17dd0;hp=57b9ecfe52b2fb695279f8816ed4c77c83d5c080;hpb=07b7055d3ae14fa8caeef26d3a7b43686b3eef4e;p=matthijs%2Fupstream%2Fbackupninja-vserver.git

diff --git a/handlers/mysql b/handlers/mysql
index 57b9ecf..55bfb25 100644
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -22,7 +22,7 @@ if [ "$user" == "" ]; then
 	user=root;
 else
 	userset=true;
-	userhome=`grep "^$user:" /etc/passwd | awk -F: '{print $6}'`
+	userhome=`getent passwd "$user" | awk -F: '{print $6}'`
 	[ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
 fi
 
@@ -56,8 +56,11 @@ then
 	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 $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