Index: contrib/init.d/pbs_server
===================================================================
--- contrib/init.d/pbs_server	(revision 4320)
+++ contrib/init.d/pbs_server	(working copy)
@@ -8,10 +8,57 @@
 # Source the library functions
 . /etc/rc.d/init.d/functions
 
+create() {
+    echo -n "Creating initial TORQUE configuration: "
+    $PBS_DAEMON -d $PBS_HOME -t create &
+    while [ ! -r $PBS_HOME/server_priv/serverdb ]; do
+        sleep 1
+    done
+    killproc pbs_server
+    RET=$?
+}
+
+start() {
+    status pbs_server >/dev/null 2>&1
+    if [ $? -eq 0 ]; then
+        echo "pbs_server is already running."
+        exit 0
+    fi
+    echo -n "Starting TORQUE Server: "
+    if [ ! -r $PBS_HOME/server_priv/serverdb ]; then
+        create
+    fi
+    daemon $PBS_DAEMON -d $PBS_HOME
+    RET=$?
+    [ $RET -eq 0 ] && touch /var/lock/subsys/pbs_server
+    echo
+}
+
+stop() {
+    status pbs_server >/dev/null 2>&1
+    if [ $? -ne 0 ]; then
+        echo "pbs_server is not running."
+        exit 0
+    fi
+    echo -n "Shutting down TORQUE Server: "
+    killproc pbs_server
+    RET=$?
+    rm -f /var/lock/subsys/pbs_server
+    echo
+}
+
+reload() {
+    echo -n "Reloading pbs_server: "
+    killproc pbs_server -HUP
+    RET=$?
+    echo
+}
+
 PBS_DAEMON=/usr/local/sbin/pbs_server
 PBS_HOME=/var/spool/torque
 export PBS_DAEMON PBS_HOME
 
+args=""
 if [ -f /etc/sysconfig/pbs_server ];then
    . /etc/sysconfig/pbs_server
 fi
@@ -19,49 +66,27 @@
 # let see how we were called
 case "$1" in
 	start) 
-		echo -n "Starting TORQUE Server: "
-		status pbs_server 2>&1 > /dev/null
-		RET=$?
-		[ $RET -eq 0 ] && echo -n "pbs_server already running" && success && echo && exit 0
-
-                # ulimit -c unlimited  # Uncomment this to preserve core files
-		if [ -r $PBS_HOME/server_priv/serverdb ]
-		then
-			daemon $PBS_DAEMON -d $PBS_HOME
-		else
-			daemon $PBS_DAEMON -t create -d $PBS_HOME
-		fi
-		RET=$?
-		[ $RET -eq 0 ] && touch /var/lock/subsys/pbs_server
-		echo
+		start
 		;;
 	stop)
-		echo -n "Shutting down TORQUE Server: "
-		status pbs_server 2>&1 > /dev/null
-		RET=$?
-		[ ! $RET -eq 0 ] && echo -n "pbs_server already stopped" && success && echo && exit 0
-
-		killproc pbs_server
-		RET=$?
-		rm -f /var/lock/subsys/pbs_server
-		echo
+		stop
 		;;
 	status)
 		status pbs_server
 		RET=$?
 		;;
 	restart)
-		$0 stop
-		$0 start
+		stop
+		start
 		;;
 	reload)
-		echo -n "Reloading pbs_server: "
-		killproc pbs_server -HUP
-		RET=$?
-		echo
+		reload
 		;;
+	create)
+		create
+		;;
 	*)
-		echo "Usage: pbs_server {start|stop|restart|status|reload}"
+		echo "Usage: pbs_server {start|stop|restart|status|reload|create}"
 		exit 1
 esac
 exit $RET