start lxdm-binary and not lxdm. export LANG in init script
authorNikolas Poniros <edhunter@sidux.com>
Fri, 7 May 2010 10:15:38 +0000 (12:15 +0200)
committerNikolas Poniros <edhunter@sidux.com>
Fri, 7 May 2010 10:15:38 +0000 (12:15 +0200)
debian/lxdm.init

index e1b47d6..cc99da5 100644 (file)
@@ -42,9 +42,13 @@ HEED_DEFAULT_DISPLAY_MANAGER=
 DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
-DAEMON=/usr/sbin/lxdm
+DAEMON=/usr/sbin/lxdm-binary
 PIDFILE=/var/run/lxdm.pid
 
+if [ -n "$LANG" ]; then
+    export LANG
+fi
+
 test -x $DAEMON || exit 0
 
 . /lib/lsb/init-functions
@@ -56,7 +60,7 @@ case "$1" in
   start)
     if [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] &&
        [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] &&
-       [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "${DAEMON}" ]; then
+       [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "/usr/sbin/lxdm" ]; then
       echo "Not starting X display manager (lxdm); it is not the default" \
         "display manager."
     else