diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2016-11-30 13:04:02 +0100 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2016-12-17 10:57:41 -0500 |
| commit | 8b61539ea0a32637871c735354469a6a04fa5aa3 (patch) | |
| tree | e2175f3834e53004b32223f6b98aaa80c36bb8cf /meta-networking | |
| parent | 8f2c04b9a1a24a543a71878d4952ff7316550fb3 (diff) | |
| download | meta-openembedded-contrib-8b61539ea0a32637871c735354469a6a04fa5aa3.tar.gz | |
samba: move /etc/sysconfig to more common /etc/default, package tmpfiles.d in samba-common
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 9 |
1 files 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 b8d714140a..76f97cf99d 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb @@ -109,7 +109,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 @@ -134,8 +136,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 @@ -203,6 +205,7 @@ FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ FILES_${BPN}-common = "${sysconfdir}/default \ ${sysconfdir}/samba \ + ${sysconfdir}/tmpfiles.d \ " FILES_${PN} += "${libdir}/vfs/*.so \ |