mysql,pgsql,svn,sys: fixed failing "is vserver running" test

[matthijs/upstream/backupninja.git] / handlers / pgsql

diff --git a/handlers/pgsql b/handlers/pgsql
index 11a5cfef772475fbed210b7e474212034cd255e8..dd1a2ea90b16b3a4d827de0feee26b500ef6ad3d 100644 (file)
--- a/handlers/pgsql
+++ b/handlers/pgsql
@@ -30,7 +30,7 @@ if [ $usevserver ]; then
     [ -d $vroot ] || fatal "vserver '$vsname' does not exist at '$vroot'"
     # is it running ?
     running=`$VSERVERINFO $vsname RUNNING`
-    if [ $running = 1 ]; then
+    if [ "$running" = "1" ]; then
        if [ "$databases" == "all" ]; then
            [ -x "$vroot`$VSERVER $vsname exec which $PGSQLDUMPALL`" ] || \
                fatal "Can't find $PGSQLDUMPALL in vserver $vsname."
@@ -58,7 +58,7 @@ fi
 
 # give backup dir the good uid and permissions
 # (in respect to the vserver, if $usevserver)
-pguid=`grep '^postgres:' $vroot/etc/passwd | awk -F: '{print $3}'`
+pguid=`getent passwd postgres | awk -F: '{print $3}'`
 [ -n "$pguid" ] || \
     fatal "No user called postgres`[ $usevserver != 1 ] || echo \" on vserver $vsname\"`."
 debug "chown $pguid $vroot$backupdir"