aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2016-10-18 10:24:36 +0200
committerAndreas Oberritter <obi@opendreambox.org>2017-02-16 11:29:19 +0100
commit20a31196fd8193e19c06a7c5deeffcec55e2c161 (patch)
treebd9d23f357ee2b8977e3f9cdc1e3a2958b274597
parent273a72ee3ab0daa1d93be5253fde6a908413d65b (diff)
downloadmeta-openembedded-contrib-20a31196fd8193e19c06a7c5deeffcec55e2c161.tar.gz
meta-openembedded-contrib-20a31196fd8193e19c06a7c5deeffcec55e2c161.tar.bz2
meta-openembedded-contrib-20a31196fd8193e19c06a7c5deeffcec55e2c161.zip
samba: rename initscript from 'samba.sh' to more common 'samba'
This gets masked automatically by samba.service if systemd is running. Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-rw-r--r--meta-networking/recipes-connectivity/samba/samba_4.4.5.bb10
1 files changed, 5 insertions, 5 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 5822c529e1..755f2e7e4b 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -33,7 +33,7 @@ DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libld
SYSVINITTYPE_linuxstdbase = "lsb"
SYSVINITTYPE = "sysv"
-INITSCRIPT_NAME = "samba.sh"
+INITSCRIPT_NAME = "samba"
INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ."
PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
@@ -102,15 +102,15 @@ do_install_append() {
>> ${D}${sysconfdir}/tmpfiles.d/samba.conf
elif ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)}; then
install -d ${D}${sysconfdir}/init.d
- install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d
+ install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d/samba
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
+ install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba
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
+ -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \
+ -i ${D}${sysconfdir}/init.d/samba
fi
install -d ${D}${sysconfdir}/samba