summaryrefslogtreecommitdiff
path: root/packages/sharp-binary-only
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2005-07-31 20:42:09 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-07-31 20:42:09 +0000
commitb240445446acfe0099bbf58c6ac7d9aaa480e4d9 (patch)
tree83fd13466933ecd87fe5a0cb7e8d9ed49fa37842 /packages/sharp-binary-only
parent7214cc754a8cb4b65c36c4e84adf6bfcacc486f4 (diff)
sdcontrol: Fix parsing when /media/card is defined twice in fstab
Diffstat (limited to 'packages/sharp-binary-only')
-rwxr-xr-xpackages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol6
1 files changed, 3 insertions, 3 deletions
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