--- rpms/ejabberd/contribs7/ejabberd.init	2008/05/08 19:50:17	1.1
+++ rpms/ejabberd/contribs7/ejabberd.init	2008/06/25 19:02:58	1.2
@@ -17,12 +17,12 @@
 
 . /etc/rc.d/init.d/functions
 
-node=`hostname | cut -d. -f1`
+node=`hostname -s`
 
 start() {
         echo -n $"Starting ejabberd: "
         daemon --user=ejabberd --check=ejabberd \
-	    "erl" "-pa @libdir@/ejabberd-@version@/ebin \
+	    "erl" "-pa @libdir@/ejabberd/ebin \
                    -sname ejabberd \
                    -s ejabberd \
                    -ejabberd config \\\"/etc/ejabberd/ejabberd.cfg\\\" \
@@ -40,7 +40,7 @@ start() {
 stop() {
         # Stop daemons.
         echo -n "Shutting down ejabberd: "
-        /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd-@version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node stop" && success || failure
+        /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node stop" && success || failure
         RETVAL=$?
         [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ejabberd
         echo
@@ -74,7 +74,7 @@ case "$1" in
         [ -f /var/lock/subsys/ejabberd ] && restart || :
         ;;
   status)
-        /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd-@version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node status"
+        /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node status"
         ;;
   *)
         echo "Usage: ejabberd {start|stop|restart|force-reload|condrestart|try-restart|status}"