diff options
author | Jens Rehsack <rehsack@gmail.com> | 2015-10-27 21:10:19 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-11-02 14:59:27 +0100 |
commit | a61ce1bbe18b733f7b428c81c5997909b23a7fdd (patch) | |
tree | c8a77af8e88f06088556535d0ec2e287a7c41915 | |
parent | c02373c634825b8a562790f9745056fe26619d26 (diff) | |
download | meta-openembedded-a61ce1bbe18b733f7b428c81c5997909b23a7fdd.tar.gz |
samba: add support for sysvinit via lsb-init-functions
Since there're surely lot's of individual distibutions not moved to systemd,
allow sane samba start/stop with systemv anyway. Rely on lsb-init-functions
for improved control.
Signed-off-by: Jens Rehsack <sno@netbsd.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-connectivity/samba/samba_4.1.12.bb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb b/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb index 22c2bb4fe6..0a0487060d 100644 --- a/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb +++ b/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb | |||
@@ -97,6 +97,11 @@ do_install_append() { | |||
97 | install -d ${D}${sysconfdir}/tmpfiles.d | 97 | install -d ${D}${sysconfdir}/tmpfiles.d |
98 | echo "d ${localstatedir}/log/samba 0755 root root -" \ | 98 | echo "d ${localstatedir}/log/samba 0755 root root -" \ |
99 | > ${D}${sysconfdir}/tmpfiles.d/99-${BPN}.conf | 99 | > ${D}${sysconfdir}/tmpfiles.d/99-${BPN}.conf |
100 | elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | ||
101 | install -d ${D}${sysconfdir}/init.d | ||
102 | install -m 0644 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d | ||
103 | update-rc.d -r ${D} samba.sh start 20 3 5 . | ||
104 | update-rc.d -r ${D} samba.sh start 20 0 1 6 . | ||
100 | fi | 105 | fi |
101 | 106 | ||
102 | install -d ${D}${sysconfdir}/samba | 107 | install -d ${D}${sysconfdir}/samba |
@@ -118,7 +123,9 @@ FILES_${PN} += "/run \ | |||
118 | " | 123 | " |
119 | 124 | ||
120 | SMB_SERVICE="${systemd_unitdir}/system/nmb.service ${systemd_unitdir}/system/smb.service" | 125 | SMB_SERVICE="${systemd_unitdir}/system/nmb.service ${systemd_unitdir}/system/smb.service" |
126 | SMB_SYSV="${sysconfdir}/init.d ${sysconfdir}/rc?.d" | ||
121 | FILES_${PN} +="${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${SMB_SERVICE}', '', d)}" | 127 | FILES_${PN} +="${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${SMB_SERVICE}', '', d)}" |
128 | FILES_${PN} +="${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SMB_SYSV}', '', d)}" | ||
122 | 129 | ||
123 | FILES_${PN}-dbg += "${libdir}/samba/idmap/.debug/* \ | 130 | FILES_${PN}-dbg += "${libdir}/samba/idmap/.debug/* \ |
124 | ${libdir}/samba/pdb/.debug/* \ | 131 | ${libdir}/samba/pdb/.debug/* \ |