From: Andreas Oberritter <o...@opendreambox.org>
Signed-off-by: Andreas Oberritter <o...@opendreambox.org>
Signed-off-by: Joe MacDonald <joe_macdon...@mentor.com>
---
meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index a678578..1caf8af 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -108,7 +108,9 @@ do_install_append() {
install -d ${D}${systemd_system_unitdir}
install -m 0644 packaging/systemd/*.service ${D}${systemd_system_unitdir}
- sed -i 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,'
${D}${systemd_system_unitdir}/*.service
+ sed -e 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' \
+ -e 's,/etc/sysconfig/samba,${sysconfdir}/default/samba,' \
+ -i ${D}${systemd_system_unitdir}/*.service
install -d ${D}${sysconfdir}/tmpfiles.d
install -m644 packaging/systemd/samba.conf.tmp
${D}${sysconfdir}/tmpfiles.d/samba.conf
@@ -133,8 +135,8 @@ do_install_append() {
install -m644 packaging/LSB/smb.conf ${D}${sysconfdir}/samba/smb.conf
install -D -m 644 ${WORKDIR}/volatiles.03_samba
${D}${sysconfdir}/default/volatiles/03_samba
- install -d ${D}${sysconfdir}/sysconfig/
- install -m644 packaging/systemd/samba.sysconfig
${D}${sysconfdir}/sysconfig/samba
+ install -d ${D}${sysconfdir}/default
+ install -m644 packaging/systemd/samba.sysconfig
${D}${sysconfdir}/default/samba
# install ctdb config file and test cases
install -D -m 0644 ${S}/ctdb/tests/onnode/nodes
${D}${sysconfdir}/ctdb/nodes
@@ -202,6 +204,7 @@ FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \
FILES_${BPN}-common = "${sysconfdir}/default \
${sysconfdir}/samba \
+ ${sysconfdir}/tmpfiles.d \
"
FILES_${PN} += "${libdir}/vfs/*.so \
--
1.9.1
--
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
