diff --git a/ChangeLog b/ChangeLog index b7c2a77c01c1d93e19509ebf4f88c991d6590f85..09c4747f27a7c17bf6dfc1d6fab3f9996c420a16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,8 @@ version 0.9.6 -- unreleased . make deleted maildirs record the date they were deleted . add destid_file configuration option to enable you to specify an alternate ssh public key authentication file (defaulting to /root/.ssh/id_rsa) + pgsql, mysql, svn: + . use new vservers_running function from lib/vserver (factorization++) sys: . update for 2.6 kernels: use /proc/kallsyms instead of /proc/ksyms (Closes: Trac#39) diff --git a/handlers/mysql.in b/handlers/mysql.in index defb72aa8aeb98713d807024a5a488bcbca43cdd..fe1e7832f32ee43c090cf5e17d6e985e040f8376 100644 --- a/handlers/mysql.in +++ b/handlers/mysql.in @@ -31,10 +31,7 @@ if [ $vservers_are_available = yes ]; then fatal "The vserver given in vsname ($vsname) does not exist." fi # is it running ? - $VSERVERINFO -q $vsname RUNNING - if [ $? -ne 0 ]; then - fatal "The vserver $vsname is not running." - fi + vservers_running $vsname || fatal "The vserver $vsname is not running." # everything ok info "Using vserver '$vsname'." usevserver=yes diff --git a/handlers/pgsql.in b/handlers/pgsql.in index 1b4a45215aad73a559cc2b2c02cc11c103c91bf7..f334bf2fffedbee12148b2a29e55c75f6b62d189 100644 --- a/handlers/pgsql.in +++ b/handlers/pgsql.in @@ -21,10 +21,7 @@ if [ $vservers_are_available = yes ]; then fatal "The vserver given in vsname ($vsname) does not exist." fi # is it running ? - $VSERVERINFO -q $vsname RUNNING - if [ $? -ne 0 ]; then - fatal "The vserver $vsname is not running." - fi + vservers_running $vsname || fatal "The vserver $vsname is not running." # everything ok info "Using vserver '$vsname'." usevserver=yes diff --git a/handlers/svn.in b/handlers/svn.in index 377d71c6de57533af0bc81f259fab62d56930f05..d19b0b8c403b785cc595e4134011b5d1deccc973 100644 --- a/handlers/svn.in +++ b/handlers/svn.in @@ -22,10 +22,7 @@ if [ $vservers_are_available = yes ]; then fatal "The vserver given in vsname ($vsname) does not exist." fi # is it running ? - $VSERVERINFO -q $vsname RUNNING - if [ $? -ne 0 ]; then - fatal "The vserver $vsname is not running." - fi + vservers_running $vsname || fatal "The vserver $vsname is not running." # everything ok info "Using vserver '$vsname'." usevserver=yes