--- trunk/xorg/xdm.rc 2008/12/26 02:04:07 732 +++ trunk/xorg/xdm.rc 2010/11/18 18:56:55 1191 @@ -29,7 +29,7 @@ GLOGINCMD="$(which kdm 2> /dev/null)" if [ ! -f "${GLOGINCMD}" ] then - echo "Failure: KDE Login Manager not found." + rc_echo "Failure: KDE Login Manager not found." exit 1 fi ;; @@ -43,7 +43,7 @@ fi if [ ! -f "${GLOGINCMD}" ] then - echo "Failure: GNOME Login Manager not found." + rc_echo "Failure: GNOME Login Manager not found." exit 1 fi ;; @@ -52,7 +52,7 @@ GLOGINCMD="$(which entranced 2> /dev/null)" if [ ! -f "${GLOGINCMD}" ] then - echo "Failure: Enlightenment Login Manager not found." + rc_echo "Failure: Enlightenment Login Manager not found." exit 1 fi ;; @@ -61,7 +61,7 @@ GLOGINCMD="$(which wdm 2> /dev/null)" if [ ! -f "${GLOGINCMD}" ] then - echo "Failure: Windowmaker Login Manager not found." + rc_echo "Failure: Windowmaker Login Manager not found." exit 1 fi ;; @@ -70,7 +70,7 @@ GLOGINCMD="$(which xdm 2> /dev/null)" if [ ! -f "${GLOGINCMD}" ] then - echo "Failure: XDM Login Manager not found." + rc_echo "Failure: XDM Login Manager not found." exit 1 fi ;; @@ -79,7 +79,7 @@ GLOGINCMD="$(which ${GLOGIN} 2> /dev/null)" if [ ! -f "${GLOGINCMD}" ] then - echo "Failure: \"${GLOGIN}\" Login Manager not found." + rc_echo "Failure: \"${GLOGIN}\" Login Manager not found." exit 1 fi ;; @@ -89,7 +89,7 @@ case "${XDM_OPT}" in start) get_login - echo -e ${COLOREDSTAR}"Starting ${GLOGIN} ..." + rc_print "Starting ${GLOGIN} ..." /sbin/telinit a evaluate_retval @@ -100,7 +100,7 @@ get_login if [ -n "$(ps -A|grep $(basename ${GLOGINCMD}))" ] then - echo -e ${COLOREDSTAR}"Stopping ${GLOGIN} ..." + rc_print "Stopping ${GLOGIN} ..." CUR_VT=$(fgconsole) start-stop-daemon --stop --quiet --exe ${GLOGINCMD} @@ -121,7 +121,7 @@ statusproc ${GLOGINCMD} ;; *) - echo "Usage: $0 {start|stop|restart|status}" + rc_echo "Usage: $0 {start|stop|restart|status}" exit 1 ;; esac