projects
/
matthijs
/
upstream
/
backupninja-vserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r208@um: micah | 2005-12-26 22:43:36 -0500
[matthijs/upstream/backupninja-vserver.git]
/
handlers
/
mysql
diff --git
a/handlers/mysql
b/handlers/mysql
index 57b9ecfe52b2fb695279f8816ed4c77c83d5c080..55bfb25be0de184e9b4e1b897053d708e4eac19b 100644
(file)
--- a/
handlers/mysql
+++ b/
handlers/mysql
@@
-22,7
+22,7
@@
if [ "$user" == "" ]; then
user=root;
else
userset=true;
user=root;
else
userset=true;
- userhome=`g
rep "^$user:" /etc/passwd
| awk -F: '{print $6}'`
+ userhome=`g
etent passwd "$user"
| awk -F: '{print $6}'`
[ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
fi
[ -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 ?
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
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
defaultsfile=""
if [ "$dbusername" != "" -a "$dbpassword" != "" ]; then
- home=`g
rep '^root:' /etc/passwd
| awk -F: '{print $6}'`
+ home=`g
etent 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
[ -d $home ] || fatal "Can't find root's home directory ($home)."
mycnf="$home/.my.cnf"
if [ -f $mycnf ]; then