From: intrigeri <intrigeri@758a04ac-41e6-0310-8a23-8373a73cc35d>
Date: Sat, 27 Aug 2005 00:19:50 +0000 (+0000)
Subject: mysql and dup handlers: when using a vserver, check if it is running
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;ds=inline;h=eded1b9dc7508a6f5de906d7aaeaffcd3f9a1730;p=matthijs%2Fupstream%2Fbackupninja-vserver.git

mysql and dup handlers: when using a vserver, check if it is running

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

diff --git a/changelog b/changelog
index 2dae7ad..8e056cf 100644
--- a/changelog
+++ b/changelog
@@ -27,6 +27,8 @@ version 0.8 --
           then nano, vim and vi, and aborts if none of these exists.
     added helper for pgsql handler.
     rdiff handler now does not require 'label'
+    changes to mysql and svn handlers' vservers support
+        these handlers now check if the source vserver is running
 
 version 0.7 -- July 26 2005
 	added ninjahelper: a dialog based wizard for creating backupninja configs.
diff --git a/handlers/mysql b/handlers/mysql
index d5c0370..e5306db 100644
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -39,11 +39,16 @@ then
 	fi
 fi
 
-# Check to make sure that the specified vserver exists
+# If needed, make sure that the specified vserver exists and is running.
 if [ $usevserver ]
 then
+        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."
 fi
 	
 # create backup dirs, the vroot variable will be empty if no vsname was specified
diff --git a/handlers/pgsql b/handlers/pgsql
index 11a5cfe..9b1d8b7 100644
--- a/handlers/pgsql
+++ b/handlers/pgsql
@@ -1,3 +1,4 @@
+#! /bin/sh
 #
 # PostgreSQL handler script for backupninja
 #
diff --git a/handlers/svn b/handlers/svn
index 551255b..6ac5402 100644
--- a/handlers/svn
+++ b/handlers/svn
@@ -23,11 +23,16 @@ then
 	fi
 fi
 
-# Check to make sure that the specified vserver exists
+# If needed, make sure that the specified vserver exists and is running.
 if [ $usevserver ]
 then
+	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."
 fi
 
 cd $vroot$src