login-manager: simplify get_valid_lms, fix for kbdless devices with only one dm installed
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 9 Mar 2006 14:36:03 +0000 (14:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Mar 2006 14:36:03 +0000 (14:36 +0000)
packages/login-manager/files/login-manager

index 7b62dfa..deadaa6 100644 (file)
@@ -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(){