From 77242032b3a0f25b7eea9d26c5dd685478813f6e Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 26 Nov 2008 14:18:08 -0500 Subject: 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. --- packages/samba/samba.inc | 4 ++++ packages/samba/samba_3.0.23c.bb | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'packages/samba') diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc index a429307d46..f44b592300 100644 --- 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 f477001970..96343aa6a4 100644 --- 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" -- cgit v1.2.3