- switch from pam_make to pam_exec

[packages/gdm2.20.git] / gdm.init

diff --git a/gdm.init b/gdm.init
index 286b54759a339aa83216d6362e76eea482dca646..629f9033537aeee811ad1d289a6bb76c28881eb6 100644 (file)
--- a/gdm.init
+++ b/gdm.init
@@ -4,8 +4,8 @@
 #
 # Version:     @(#) /etc/rc.d/init.d/gdm 0.1
 #
-# chkconfig:   5 95 5
-# description: Starts and stops the Gnome Display Manager at startup and
+# chkconfig:   5 95 05
+# description: Starts and stops the Gnome Display Manager at startup and \
 #              shutdown..
 #
 # config:      /etc/X11/gdm/gdm-config
@@ -15,22 +15,22 @@
 . /etc/rc.d/init.d/functions
 
 # Get service config
-if [ -f /etc/sysconfig/gdm ] ; then
+if [ -f /etc/sysconfig/gdm ]; then
        . /etc/sysconfig/gdm
 fi
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/gdm ]; then
                msg_starting "Gnome Display Manager"
-               daemon open /usr/bin/gdm
+               daemon /usr/sbin/gdm
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gdm
        else
                msg_already_running "Gnome Display Manager"
-               exit 1
        fi
        ;;
   stop)
@@ -40,19 +40,20 @@ case "$1" in
                rm -f /var/lock/subsys/gdm
        else
                msg_not_running "Gnome Display Manager"
-               exit 1
        fi
        ;;
   status)
-       status gdm
+       status gdm gdm-binary
+       exit $?
        ;;
-  restart|reload)
+  restart|force-reload)
        $0 stop
        $0 start
+       exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL