From: Tom Rini <trini@embeddedalley.com>
Date: Wed, 26 Nov 2008 19:22:41 +0000 (-0500)
Subject: samba: Fix mount.cifs location
X-Git-Tag: Release-2010-05/1~5075
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c7d1e2ba6bd0b1f597c73fb283ec86cf369fc9a;p=openembedded.git

samba: Fix mount.cifs location

Also part of bug 3880 is that cifs has the same problem smb/smbfs had, the
mount helper must be in /sbin.  While in here, also actually install
mount.cifs
---

diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc
index f44b592300..a933c551bb 100644
--- a/packages/samba/samba.inc
+++ b/packages/samba/samba.inc
@@ -16,7 +16,7 @@ EXTRA_OECONF='--disable-cups --with-readline=${STAGING_LIBDIR}/.. \
 PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc smbfs smbfs-doc"
 FILES_smbfs = "${bindir}/smbmount ${bindir}/smbumount ${bindir}/smbmnt"
 FILES_smbfs-doc = "${mandir}/man8/smbmount.8 ${mandir}/man8/smbumount.8 ${mandir}/man8/smbmnt.8"
-FILES_cifs = "${sbindir}/mount.cifs ${sbindir}/umount.cifs"
+FILES_cifs = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs"
 FILES_cifs-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8"
 FILES_libsmbclient = "${libdir}/libsmbclient.so.*"
 FILES_libsmbclient-dev = "${libdir}/libsmbclient.so ${includedir}"
@@ -44,7 +44,9 @@ do_install_append() {
 	ln -sf ${bindir}/smbmount ${D}${base_sbindir}/mount.smbfs
 	rm -f ${D}${bindir}/*.old
 	rm -f ${D}${sbindir}/*.old
-	install -c -m 755 mount.cifs  ${D}${bindir}/mount.cifs
+	install -c -m 755 mount.cifs  ${D}${base_sbindir}/mount.cifs
+	[ -f ${D}${sbindir}/mount.cifs ] && mv ${D}${sbindir}/mount.cifs ${D}${base_sbindir}/
+	[ -f ${D}${sbindir}/umount.cifs ] && mv ${D}${sbindir}/umount.cifs ${D}${base_sbindir}/
 }
 
 do_stage() {