Author: glen Date: Sun Aug 14 10:17:01 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- unify, add try-restart
---- Files affected:
packages/gdm:
gdm.init (1.19 -> 1.20)
---- Diffs:
================================================================
Index: packages/gdm/gdm.init
diff -u packages/gdm/gdm.init:1.19 packages/gdm/gdm.init:1.20
--- packages/gdm/gdm.init:1.19 Thu Jan 27 23:10:06 2011
+++ packages/gdm/gdm.init Sun Aug 14 12:16:56 2011
@@ -21,41 +21,67 @@
. /etc/sysconfig/gdm
fi
+start() {
+ # Check if the service is already running?
+ if [ -f /var/lock/subsys/gdm ]; then
+ msg_already_running "Gnome Display Manager"
+ return
+ fi
+
+ msg_starting "Gnome Display Manager"
+ start-stop-daemon --start -b --exec /usr/sbin/gdm
+ ok
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gdm
+}
+
+stop() {
+ if [ ! -f /var/lock/subsys/gdm ]; then
+ msg_not_running "Gnome Display Manager"
+ return
+ fi
+
+ msg_stopping "Gnome Display Manager"
+ killproc gdm
+ rm -f /var/lock/subsys/gdm
+}
+
+condrestart() {
+ if [ ! -f /var/lock/subsys/gdm ]; then
+ msg_not_running "Gnome Display Manager"
+ RETVAL=$1
+ return
+ fi
+
+ stop
+ start
+}
+
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"
- start-stop-daemon --start -b --exec /usr/sbin/gdm
- ok
- RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gdm
- else
- msg_already_running "Gnome Display Manager"
- fi
+ start
;;
stop)
- if [ -f /var/lock/subsys/gdm ]; then
- msg_stopping "Gnome Display Manager"
- killproc gdm
- rm -f /var/lock/subsys/gdm
- else
- msg_not_running "Gnome Display Manager"
- fi
+ stop
+ ;;
+ restart)
+ stop
+ start
+ ;;
+ try-restart)
+ condrestart 0
+ ;;
+ force-reload)
+ condrestart 7
;;
status)
status gdm gdm-binary
- exit $?
- ;;
- restart|force-reload)
- $0 stop
- $0 start
- exit $?
+ RETVAL=$?
;;
*)
- msg_usage "$0 {start|stop|restart|force-reload|status}"
+ msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
exit 3
esac
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdm/gdm.init?r1=1.19&r2=1.20&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
