--- kdm.ori/init.d/kdm 2005-03-21 23:25:22.000000000 -0800 +++ kdm.new/init.d/kdm 2005-03-22 23:29:13.208242512 -0800 @@ -4,6 +4,9 @@ # # description: K Desktop Manager # + +. /lib/lsb/init-functions + set -e # To start kdm even if it is not the default display manager, change @@ -52,11 +55,11 @@ if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] && [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then - echo "Not starting K Desktop Manager (kdm); it is not the default display manager." + log_warning_msg "Not starting K Desktop Manager (kdm); it is not the default display manager." else - echo -n "Starting K Desktop Manager: kdm" - start-stop-daemon --start --quiet $SSD_ARGS -- $ARG || echo -n " already running" - echo "." + log_begin_msg "Starting K Desktop Manager (kdm)..." + start-stop-daemon --start --quiet $SSD_ARGS -- $ARG || log_end_msg 1 + log_end_msg 0 fi ;; @@ -71,11 +74,12 @@ ;; reload) - echo -n "Reloading K Desktop Manager configuration..." + log_begin_msg "Reloading K Desktop Manager configuration..." if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then - echo "done." + log_end_msg 0 else - echo "kdm not running." + log_warning_msg "kdm not running" + log_end_msg 1 fi ;; @@ -84,9 +88,10 @@ ;; stop) - echo -n "Stopping K Desktop Manager: kdm" + log_begin_msg "Stopping K Desktop Manager (kdm)..." if [ ! -f $PIDFILE ]; then - echo " not running ($PIDFILE not found)." + log_warning_msg "kdm not running ($PIDFILE not found)" + log_end_msg 0 exit 0 else DAEMONPID=$(cat $PIDFILE | tr -d '[:blank:]') @@ -96,7 +101,7 @@ # give kdm's signal handler a second to catch its breath sleep 1 else - echo -n " not running" + log_warning_msg "kdm not running" fi fi while [ $KILLCOUNT -le 5 ]; do @@ -109,16 +114,17 @@ KILLCOUNT=$(( $KILLCOUNT + 1 )) done if stillrunning; then - echo -n " not responding to TERM signal (pid $DAEMONPID)" + log_warning_msg "kdm not responding to TERM signal (pid $DAEMONPID)" + log_end_msg 1 else rm -f $UPGRADEFILE + log_end_msg 0 fi fi - echo "." ;; *) - echo "Usage: /etc/init.d/kdm {start|stop|restart|reload|force-reload}" + log_success_msg "Usage: /etc/init.d/kdm {start|stop|restart|reload|force-reload}" exit 1 ;; esac