From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 9 Mar 2006 14:36:03 +0000 (+0000)
Subject: login-manager: simplify get_valid_lms, fix for kbdless devices with only one dm installed
X-Git-Tag: Release-2010-05/1~9453^2~2261
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e235fe50eac2876a3ca837c9168975e52240609;p=openembedded.git

login-manager: simplify get_valid_lms, fix for kbdless devices with only one dm installed
---

diff --git a/packages/login-manager/files/login-manager b/packages/login-manager/files/login-manager
index 7b62dfa76b..deadaa61c2 100644
--- a/packages/login-manager/files/login-manager
+++ b/packages/login-manager/files/login-manager
@@ -46,32 +46,15 @@ get_valid_lms() {
 			if echo "$LM_FILES" | grep -iq "$lm"
 			then
 				test -x "$LM_PATH/$lm" && VALID_LMS="$VALID_LMS $lm" || echo -e "\t* Discarding [$lm]: Not executable"
-			
 			fi
 		done
-
-		if test  "`echo "$VALID_LMS" | wc -w | tr -d " "`" -gt 1
-		then
-			SELECTED_LM="$LM_PATH/`echo "$VALID_LMS" | awk '{print $1}'`"				
-		else
-			SELECTED_LM="$VALID_LMS"				
-		fi
-		
-		
 	else
 		for lm in $LM_FILES
 		do
 			test -x "$LM_PATH/$lm" && VALID_LMS="$VALID_LMS $lm" || echo -e "\t* Discarding [$lm]: Not executable"
 		done	
-
-		if test  "`echo "$VALID_LMS" | wc -w | tr -d " "`" -gt 1
-		then
-			SELECTED_LM="$LM_PATH/`echo "$VALID_LMS" | awk '{print $1}'`"				
-		else
-			# Use awk here, too to filter a backspace in VALID_LMS
-			SELECTED_LM="$LM_PATH/`echo "$VALID_LMS" | awk '{print $1}'`"				
-		fi
 	fi	
+	SELECTED_LM="$LM_PATH/`echo "$VALID_LMS" | awk '{print $1}'`"
 }
 
 do_start(){