summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-connectivity
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2016-11-30 13:03:54 +0100
committerJoe MacDonald <joe_macdonald@mentor.com>2016-12-16 20:46:05 -0500
commitd491c0bcf3da3fb61260fb1fcaab358879b3bce7 (patch)
tree8ab0ad27da96e6336372424975bda237a3a029cd /meta-networking/recipes-connectivity
parent1c8720a130f07dec3f7d05d0d26bba7b0def5aa2 (diff)
downloadmeta-openembedded-d491c0bcf3da3fb61260fb1fcaab358879b3bce7.tar.gz
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> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-connectivity')
-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 6d6248155..783a7cda4 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -41,7 +41,7 @@ LDFLAGS_append_libc-musl = " -ltirpc"
41SYSVINITTYPE_linuxstdbase = "lsb" 41SYSVINITTYPE_linuxstdbase = "lsb"
42SYSVINITTYPE = "sysv" 42SYSVINITTYPE = "sysv"
43 43
44INITSCRIPT_NAME = "samba.sh" 44INITSCRIPT_NAME = "samba"
45INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." 45INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ."
46 46
47PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \ 47PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \
@@ -109,16 +109,16 @@ do_install_append() {
109 >> ${D}${sysconfdir}/tmpfiles.d/samba.conf 109 >> ${D}${sysconfdir}/tmpfiles.d/samba.conf
110 elif ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)}; then 110 elif ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)}; then
111 install -d ${D}${sysconfdir}/init.d 111 install -d ${D}${sysconfdir}/init.d
112 install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d 112 install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d/samba
113 elif ${@bb.utils.contains('PACKAGECONFIG', 'sysv', 'true', 'false', d)}; then 113 elif ${@bb.utils.contains('PACKAGECONFIG', 'sysv', 'true', 'false', d)}; then
114 install -d ${D}${sysconfdir}/init.d 114 install -d ${D}${sysconfdir}/init.d
115 install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba.sh 115 install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba
116 sed -e 's,/opt/samba/bin,${sbindir},g' \ 116 sed -e 's,/opt/samba/bin,${sbindir},g' \
117 -e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \ 117 -e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \
118 -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \ 118 -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \
119 -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba.sh,g' \ 119 -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \
120 -e 's,/usr/bin,${base_bindir},g' \ 120 -e 's,/usr/bin,${base_bindir},g' \
121 -i ${D}${sysconfdir}/init.d/samba.sh 121 -i ${D}${sysconfdir}/init.d/samba
122 fi 122 fi
123 123
124 install -d ${D}${sysconfdir}/samba 124 install -d ${D}${sysconfdir}/samba