samba: Fix mount.smb/mount.smbfs link locations

As reported by me in bug 3880, mount -t (smb|smbfs) won't work unless the
helper is in /sbin (which is where upstream places these), so that's where
we want the links too.

diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc
index a429307d46ec3d03c6b9239b2e89f1111762cf3b..f44b59230009e6db229e3dde3763b0f0fab873bd 100644 (file)
--- a/packages/samba/samba.inc
+++ b/packages/samba/samba.inc
@@ -38,6 +38,10 @@ do_compile () {
 do_install_append() {
        mv ${D}${libdir}/libsmbclient.so ${D}${libdir}/libsmbclient.so.0
        ln -sf libsmbclient.so.0 ${D}${libdir}/libsmbclient.so
+       mkdir -p ${D}${base_sbindir}
+       rm -f ${D}${sbindir}/mount.smbfs ${D}${base_sbindir}/mount.smbfs
+       ln -sf ${bindir}/smbmount ${D}${base_sbindir}/mount.smb
+       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

diff --git a/packages/samba/samba_3.0.23c.bb b/packages/samba/samba_3.0.23c.bb
index f4770019701836056591ded099dfc83953847b68..96343aa6a4e120fa78ae01c93fd368619830f4c2 100644 (file)
--- a/packages/samba/samba_3.0.23c.bb
+++ b/packages/samba/samba_3.0.23c.bb
@@ -33,8 +33,6 @@ EXTRA_OECONF += "\
 
 do_install_append() {
        install -d "${D}${localstatedir}/log"
-       rm -f ${D}/sbin/mount.smbfs
-       ln -sf smbmount ${D}${sbindir}/mount.smbfs
        install -d "${D}${sysconfdir}/init.d"
        install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba
        install -d "${D}${sysconfdir}/samba"