diff options
| author | Matthias Hentges <oe@hentges.net> | 2006-02-10 04:27:00 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-10 04:27:00 +0000 |
| commit | 1dfe53cd17ef4fb243b8fbdbd74ccfe76e40c09f (patch) | |
| tree | d28b57b45810dfe5ad3c4b394741803c22e2688b | |
| parent | a2ad4d5b600449a953ae2dc5cb042aa2942115c5 (diff) | |
login-manager: Fix a pathing bug which b0rks login-manager if only one LM is installed.
| -rw-r--r-- | packages/login-manager/files/login-manager | 19 | ||||
| -rw-r--r-- | packages/login-manager/login-manager.bb | 2 |
2 files changed, 18 insertions, 3 deletions
diff --git a/packages/login-manager/files/login-manager b/packages/login-manager/files/login-manager index 6fbc307458..7b62dfa76b 100644 --- a/packages/login-manager/files/login-manager +++ b/packages/login-manager/files/login-manager @@ -4,12 +4,25 @@ # License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) # # Date: 09-FEB-06 - +# +# This script checks if a keyboard is present and then runs a propper LM. +# On devices w/o keyboard, a LM from the NO_KBD_LMS variable is selected. +# +# If more than one usable login-manager is found, the first one is used. +# +# Users can force their favorite login-manager to be selected via symlinking +# a LM from /etc/X11/login-managers to /etc/X11/login-managers/default. +# LM_PATH="/etc/X11/login-managers" +# A list of login-manager which display an OSD keyboard NO_KBD_LMS="gpe-dm" +# +# * * * No user-variables behind this point * * * +# + run_wm() { if test -z "$1" then @@ -19,6 +32,7 @@ run_wm() { echo "$1" > /tmp/_running_lm echo -e "\t* Starting `basename "$1"`\n--\n" + "$1" start exit 0 @@ -54,7 +68,8 @@ get_valid_lms() { then SELECTED_LM="$LM_PATH/`echo "$VALID_LMS" | awk '{print $1}'`" else - SELECTED_LM="$VALID_LMS" + # Use awk here, too to filter a backspace in VALID_LMS + SELECTED_LM="$LM_PATH/`echo "$VALID_LMS" | awk '{print $1}'`" fi fi } diff --git a/packages/login-manager/login-manager.bb b/packages/login-manager/login-manager.bb index 04f8b34a8f..44d8814713 100644 --- a/packages/login-manager/login-manager.bb +++ b/packages/login-manager/login-manager.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Initscript for login-managers" SECTION = "base" PRIORITY = "optional" MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" -PR = "r0" +PR = "r1" INITSCRIPT_NAME = "login-manager" INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ." |