aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <trini@embeddedalley.com>2008-11-26 14:22:41 -0500
committerTom Rini <trini@embeddedalley.com>2008-11-26 14:22:41 -0500
commit1c7d1e2ba6bd0b1f597c73fb283ec86cf369fc9a (patch)
tree68622c29ae26b19d24894dce8414d7470b104179
parent77242032b3a0f25b7eea9d26c5dd685478813f6e (diff)
downloadopenembedded-1c7d1e2ba6bd0b1f597c73fb283ec86cf369fc9a.tar.gz
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
-rw-r--r--packages/samba/samba.inc6
1 files changed, 4 insertions, 2 deletions
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() {