From: nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>
Date: Sat, 18 Jun 2005 16:40:08 +0000 (+0000)
Subject: Merge bk://oe-devel.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~9453^2~4414
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fe3c7652480d9e3190f8cae327467782a0ac55d;p=openembedded.git

Merge bk://oe-devel.bkbits.net/openembedded
into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/18 18:03:29+02:00 handhelds.org!CoreDump
sdcontrol: Remove Samba error message

BKrev: 42b44e68qJxrDgmXlfNV79aUnXXISg
---

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 63e5256f3d..a8c6059c14 100644
--- 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
@@ -212,9 +212,10 @@ case "$ACTION" in
 	# I have no idea what this is good for....
 	if [ -d $SMB_MOUNT ] ; then
 		rm -rf $SMB_MOUNT
+		ln -s /mnt/card $SMB_MOUNT
+		mkdir -p $FS_MOUNT_POINT/$INSTALL_DIR		
 	fi
-	ln -s /mnt/card $SMB_MOUNT
-	mkdir -p $FS_MOUNT_POINT/$INSTALL_DIR
+
 
         ;;
 'eject')
diff --git a/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb b/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
index 7ed202b8b8..2be926583f 100644
--- a/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
+++ b/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "CLOSED"
 RDEPENDS = "kernel (${KERNEL_VERSION})"
-PR = "r17"
+PR = "r18"
 
 SRC_URI = "http://www.openzaurus.org/mirror/sd-modules-2.4.18-rmk7-pxa3-embedix-r3.tar.bz2 \
 	   file://sd \