From e4b9e54b22ff3045871b728fcfead1ea8d3f9649 Mon Sep 17 00:00:00 2001 From: Blake Rouse Date: Mon, 14 Dec 2020 13:58:16 -0500 Subject: [PATCH] [Elastic Agent] Fix DEB/RPM installation (#23038) * Update filename to not overwrite other file when package is built. * Add changelog. (cherry picked from commit 4807b3fe4a57076ec2f1ba2b5676d3e16c72fadf) --- dev-tools/packaging/packages.yml | 2 +- .../deb/{elastic-agent.sh.tmpl => elastic-agent.init.sh.tmpl} | 0 .../rpm/{elastic-agent.sh.tmpl => elastic-agent.init.sh.tmpl} | 0 x-pack/elastic-agent/CHANGELOG.next.asciidoc | 1 + 4 files changed, 2 insertions(+), 1 deletion(-) rename dev-tools/packaging/templates/deb/{elastic-agent.sh.tmpl => elastic-agent.init.sh.tmpl} (100%) rename dev-tools/packaging/templates/rpm/{elastic-agent.sh.tmpl => elastic-agent.init.sh.tmpl} (100%) diff --git a/dev-tools/packaging/packages.yml b/dev-tools/packaging/packages.yml index 404502ca9791..ce48eb22098d 100644 --- 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/dev-tools/packaging/templates/deb/elastic-agent.sh.tmpl b/dev-tools/packaging/templates/deb/elastic-agent.init.sh.tmpl similarity index 100% rename from dev-tools/packaging/templates/deb/elastic-agent.sh.tmpl rename to dev-tools/packaging/templates/deb/elastic-agent.init.sh.tmpl diff --git a/dev-tools/packaging/templates/rpm/elastic-agent.sh.tmpl b/dev-tools/packaging/templates/rpm/elastic-agent.init.sh.tmpl similarity index 100% rename from dev-tools/packaging/templates/rpm/elastic-agent.sh.tmpl rename to dev-tools/packaging/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 index c8847f693cca..29c7672ea747 100644 --- 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