Make invirt-database-server.postinst check whether the invirt user actually exists

[invirt/packages/invirt-database.git] / debian / invirt-database-server.postinst

diff --git a/debian/invirt-database-server.postinst b/debian/invirt-database-server.postinst
index 79fe70c..86bc5d8 100644 (file)
--- a/debian/invirt-database-server.postinst
+++ b/debian/invirt-database-server.postinst
@@ -28,13 +28,18 @@ set -e
 
 case "$1" in
     configure)
 
 case "$1" in
     configure)

+       echo "$2"

         #Don't create users on upgrade
         if [ -z "$2" ]; then
             # Don't fail if the user/database already exists
             su postgres -c 'createuser invirt -S -d -R'    || true
             su postgres -c 'createdb invirt -O invirt'   || true
         #Don't create users on upgrade
         if [ -z "$2" ]; then
             # Don't fail if the user/database already exists
             su postgres -c 'createuser invirt -S -d -R'    || true
             su postgres -c 'createdb invirt -O invirt'   || true

-            adduser --system invirt

         fi
         fi

+
+       # The invirt user *must* exist
+       if [ -z `getent passwd invirt` ]; then
+           adduser --system invirt
+       fi

        invoke-rc.d postgresql-8.3 restart
         su invirt -s /bin/sh -c 'invirt-database-tables create'
     ;;
        invoke-rc.d postgresql-8.3 restart
         su invirt -s /bin/sh -c 'invirt-database-tables create'
     ;;