From: Matthias Hentges <oe@hentges.net>
Date: Sun, 31 Jul 2005 20:42:09 +0000 (+0000)
Subject: sdcontrol: Fix parsing when /media/card is defined twice in fstab
X-Git-Tag: Release-2010-05/1~9453^2~4014^2~4^2~34
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b240445446acfe0099bbf58c6ac7d9aaa480e4d9;p=openembedded.git

sdcontrol: Fix parsing when /media/card is defined twice in fstab
---

diff --git a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol b/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol
index c170e4abdc..068d964726 100755
--- a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol
+++ b/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol
@@ -27,7 +27,7 @@ vecho() {
 
 # import FS mount options from fstab or use defaults
 # if detection fails
-SD_OPTS="`grep "$MOUNT_POINT" /etc/fstab | awk '{print $4}'`" 
+SD_OPTS="`grep "$MOUNT_POINT" /etc/fstab | head -1 | awk '{print $4}'`" 
 if test -z "$SD_OPTS"
 then
 	SD_OPTS="noatime,sync"
@@ -130,14 +130,14 @@ case "$ACTION" in
 	
 	vecho "Beginning SD auto-mount..:"
 	
-	ps ax > "$LOGFILE-ps"
+	test "$ENABLE_LOG" = yes && ps ax > "$LOGFILE-ps"
 	
 	# Read available partitions from /proc/partitions.
 	OK_PARTS=` head -20 /proc/partitions |grep mmcda | sort| uniq | awk '{print $4}'`
 	
 	decho "OK_PARTS [$OK_PARTS]"
 	
-	echo $OK_PARTS > "$LOGFILE-part"
+	test "$ENABLE_LOG" = yes && echo $OK_PARTS > "$LOGFILE-part"
 	
 	if test "`echo "$OK_PARTS" | wc -l | awk '{print $1}`" -gt 1
 	then