[Elastic Agent] Fix DEB/RPM installation (elastic#23038)

* Update filename to not overwrite other file when package is built. * Add changelog. (cherry picked from commit 4807b3f)
blakerouse · Dec 14, 2020 · e4b9e54 · e4b9e54
1 parent 380be4f
commit e4b9e54
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 1 deletion.
diff --git a/dev-tools/packaging/packages.yml b/dev-tools/packaging/packages.yml
@@ -59,7 +59,7 @@ shared:
         template: '{{ elastic_beats_dir }}/dev-tools/packaging/templates/linux/elastic-agent.unit.tmpl'
         mode: 0644
       /etc/init.d/{{.BeatServiceName}}:
-        template: '{{ elastic_beats_dir }}/dev-tools/packaging/templates/{{.PackageType}}/elastic-agent.sh.tmpl'
+        template: '{{ elastic_beats_dir }}/dev-tools/packaging/templates/{{.PackageType}}/elastic-agent.init.sh.tmpl'
         mode: 0755
       /var/lib/{{.BeatName}}/data/{{.BeatName}}-{{ commit_short }}/{{.BeatName}}{{.BinaryExt}}:
         source: build/golang-crossbuild/{{.BeatName}}-{{.GOOS}}-{{.Platform.Arch}}{{.BinaryExt}}

diff --git a/...aging/templates/deb/elastic-agent.sh.tmpl → .../templates/deb/elastic-agent.init.sh.tmpl b/...aging/templates/deb/elastic-agent.sh.tmpl → .../templates/deb/elastic-agent.init.sh.tmpl
diff --git a/...aging/templates/rpm/elastic-agent.sh.tmpl → .../templates/rpm/elastic-agent.init.sh.tmpl b/...aging/templates/rpm/elastic-agent.sh.tmpl → .../templates/rpm/elastic-agent.init.sh.tmpl
diff --git a/x-pack/elastic-agent/CHANGELOG.next.asciidoc b/x-pack/elastic-agent/CHANGELOG.next.asciidoc
@@ -27,6 +27,7 @@
 - Fix deb/rpm packaging for Elastic Agent {pull}22153[22153]
 - Fix composable input processor promotion to fix duplicates {pull}22344[22344]
 - Fix sysv init files for deb/rpm installation {pull}22543[22543]
+- Fix shell wrapper for deb/rpm packaging {pull}23038[23038]
 - Fixed parsing of npipe URI {pull}22978[22978]
 
 ==== New features