r208@um: micah | 2005-12-26 22:43:36 -0500

 Fixed mysql check to see if vserver is running

git-svn-id: http://code.autistici.org/svn/backupninja/trunk@269 758a04ac-41e6-0310-8a23-8373a73cc35d

diff --git a/ChangeLog b/ChangeLog
index 860a0a22c05a97811ad6d6c3baea1f57e108e005..d8b57c6628dfeb52f74d3b4ec998fcbbe3a7221a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 version 0.9.2 -- unreleased 
+       fixed mysql check to see if vserver is running
        fixed duplicity globbing support in include and exclude options 
        trac handler mkdir subdirectory problem fixed
        fixed broken toint() causing backups not to run when set to "everyday"

diff --git a/handlers/mysql b/handlers/mysql
index 8d59fa4b0cd1cb897b8199605930a604058adf6b..55bfb25be0de184e9b4e1b897053d708e4eac19b 100644 (file)
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -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