[oe-commits] [meta-openembedded] 91/91: samba: fix paths in sysv initscript

[git at git.openembedded.org]

martin_jansa pushed a commit to branch krogoth-next
in repository meta-openembedded.

commit 56bfdfd36899065397f5b9fab0acc5f214c4bdcc
Author: Richard Leitner <richard.leitner at skidata.com>
AuthorDate: Fri Apr 29 08:55:21 2016 +0200

    samba: fix paths in sysv initscript
    
    The sysv initscript provided by samba assumes smbd and nmbd are
    installed in /opt/samba/bin/. In our case both binaries are installed to
    /usr/sbin/ by default. Therefore fix these paths.
    
    Furthermore fix the log and config directory as well as the name of the
    initscript in its usage text.
    
    Signed-off-by: Richard Leitner <richard.leitner at skidata.com>
    Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-networking/recipes-connectivity/samba/samba_4.4.2.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb b/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
index 63586ba..383c9c9 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
@@ -106,6 +106,11 @@ do_install_append() {
     elif ${@bb.utils.contains('PACKAGECONFIG', 'sysv', 'true', 'false', d)}; then
         install -d ${D}${sysconfdir}/init.d
         install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba.sh
+        sed -e 's,/opt/samba/bin,${sbindir},g' \
+            -e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \
+            -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \
+            -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba.sh,g' \
+            -i ${D}${sysconfdir}/init.d/samba.sh
         update-rc.d -r ${D} samba.sh start 20 3 5 .
         update-rc.d -r ${D} samba.sh start 20 0 1 6 .
     fi

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.