From d491c0bcf3da3fb61260fb1fcaab358879b3bce7 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Wed, 30 Nov 2016 13:03:54 +0100 Subject: 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 Signed-off-by: Joe MacDonald --- meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'meta-networking') 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 6d6248155f..783a7cda4c 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" SYSVINITTYPE_linuxstdbase = "lsb" SYSVINITTYPE = "sysv" -INITSCRIPT_NAME = "samba.sh" +INITSCRIPT_NAME = "samba" INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \ @@ -109,16 +109,16 @@ 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' \ + -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \ -e 's,/usr/bin,${base_bindir},g' \ - -i ${D}${sysconfdir}/init.d/samba.sh + -i ${D}${sysconfdir}/init.d/samba fi install -d ${D}${sysconfdir}/samba -- cgit v1.2.3-54-g00ecf