From 2478464c6294cd46c41482063a49b6d4f3ee1e90 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Tue, 18 Oct 2016 13:51:32 +0200 Subject: samba: move /etc/sysconfig to more common /etc/default, package tmpfiles.d in samba-common Signed-off-by: Andreas Oberritter --- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 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 dad09e2c1f..65ad7fadab 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb @@ -101,7 +101,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 @@ -125,8 +127,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 rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log } @@ -178,7 +180,8 @@ FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ " FILES_${PN}-common = "${sysconfdir}/default \ - ${sysconfdir}/samba" + ${sysconfdir}/samba \ + ${sysconfdir}/tmpfiles.d" FILES_${PN} += "${libdir}/vfs/*.so \ ${libdir}/charset/*.so \ -- cgit 1.2.3-korg