--- cyphesis-0.5.15/cyphesis.init.orig	2008-04-09 11:02:46.000000000 -0700

+++ cyphesis-0.5.15/cyphesis.init	2008-04-09 11:03:07.000000000 -0700

@@ -24,28 +24,28 @@

         # Start the daemon.

         # Make sure postgres superuser exists

-        if ! su $POSTGRESUSER -c true >/dev/null 2>&1; then

+        if ! runuser $POSTGRESUSER -c true >/dev/null 2>&1; then

             echo

             echo $"Could not check for running PostgreSQL database."

             return 1

         fi

         # Make sure postgres is running

-        if ! su $POSTGRESUSER -c "psql -c \"\" template1" >/dev/null 2>&1; then

+        if ! runuser $POSTGRESUSER -c "psql -c \"\" template1" >/dev/null 2>&1; then

             echo $"PostgreSQL server is not running."

             return 1

         fi

         # Make sure the user we are going to run as exists

-        if ! su $CYPHESISUSER -c true >/dev/null 2>&1; then

+        if ! runuser $CYPHESISUSER -c true >/dev/null 2>&1; then

             echo $"Cannot find user $CYPHESISUSER to run cyphesis service."

             return 1

         fi

         # Make sure the user has a postgres account

-        if ! su $CYPHESISUSER -c "psql -c \"\" template1" >/dev/null 2>&1; then

+        if ! runuser $CYPHESISUSER -c "psql -c \"\" template1" >/dev/null 2>&1; then

             echo -n $"Creating PostgreSQL account: "

-            su $POSTGRESUSER -c "createuser -A -d -q -R $CYPHESISUSER" >/dev/null 2>&1

+            runuser $POSTGRESUSER -c "createuser -A -d -q -R $CYPHESISUSER" >/dev/null 2>&1

             RETVAL=$?

             if [ $RETVAL -eq 0 ]; then

                 echo_success

@@ -58,10 +58,10 @@

         fi

         # Make sure the database exists

-        if ! su $CYPHESISUSER -c "psql -c \"\" cyphesis" >/dev/null 2>&1; then

+        if ! runuser $CYPHESISUSER -c "psql -c \"\" cyphesis" >/dev/null 2>&1; then

             # Create the database

             echo -n $"Creating PostgreSQL database: "

-            su $CYPHESISUSER -c "createdb -q cyphesis" >/dev/null 2>&1

+            runuser $CYPHESISUSER -c "createdb -q cyphesis" >/dev/null 2>&1

             RETVAL=$?

             if [ $RETVAL -eq 0 ]; then

                 echo_success

@@ -73,7 +73,7 @@

             echo

             # Populate it with rules

             echo -n $"Loading database with rules: "

-            su $CYPHESISUSER -c "cyloadrules" >/dev/null 2>&1

+            runuser $CYPHESISUSER -c "cyloadrules" >/dev/null 2>&1

             RETVAL=$?

             if [ $RETVAL -eq 0 ]; then

                 echo_success

@@ -88,7 +88,7 @@

         echo -n $"Starting cyphesis: "

         # Run the server, in self daemonising mode

-        su $CYPHESISUSER -c "/usr/bin/cyphesis --cyphesis:daemon=true" >/dev/null 2>&1

+        runuser $CYPHESISUSER -c "/usr/bin/cyphesis --cyphesis:daemon=true" >/dev/null 2>&1

         RETVAL=$?

         if [ $RETVAL -eq 0 ]; then

             echo_success

@@ -96,8 +96,24 @@

         else

             echo_failure

             echo

+            return $RETVAL

         fi

         echo

+

+        if [ "$POPULATE_WORLD" == "1" ] ; then

+            echo -n $"Populating cyphesis world: "

+

+            # Populate the world with game data

+            runuser $CYPHESISUSER -c "/usr/bin/cyclient" >/dev/null 2>&1

+            RETVAL=$?

+            if [ $RETVAL -eq 0 ]; then

+                echo_success

+            else

+                echo_failure

+            fi

+            echo

+        fi

+

         return $RETVAL

 }

@@ -107,7 +123,10 @@

         killproc cyphesis

         RETVAL=$?

         echo

-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/cyphesis

+        if [ $RETVAL -eq 0 ] ; then

+            rm -f /var/lock/subsys/cyphesis

+        fi

+

         return $RETVAL

 }