diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2020-05-19 18:02:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 08:02:23 +1000 |
| commit | 254183a2e34ebc3accbb03bfcc7e53534f731a97 (patch) | |
| tree | b1e72cab93266e2f18f690c6d9f1a4d5ecc8803b /packaging/makeself/jobs | |
| parent | 5025a3d710e587fe340adfd94eb54a22e180518d (diff) | |
Don't overwrite netdata.conf on update on static installs. (#9046)
* Don't overwrite netdata.conf on update on static installs.
The current code overwrites netdata.conf when updating a static install
because we include a copy of the default empty netdata.conf in the
package itself.
This removes that file from the generated package, but does not modify
the install-time logic which attempts to create the file if it does not
already exist (which appears to be working correctly.
* Update packaging/makeself/jobs/70-netdata-git.install.sh
Co-authored-by: James Mills <prologic@shortcircuit.net.au>
Co-authored-by: James Mills <prologic@shortcircuit.net.au>
Diffstat (limited to 'packaging/makeself/jobs')
| -rwxr-xr-x | packaging/makeself/jobs/70-netdata-git.install.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/packaging/makeself/jobs/70-netdata-git.install.sh b/packaging/makeself/jobs/70-netdata-git.install.sh index 80fba31584..238fc4817f 100755 --- a/packaging/makeself/jobs/70-netdata-git.install.sh +++ b/packaging/makeself/jobs/70-netdata-git.install.sh @@ -22,6 +22,9 @@ run ./netdata-installer.sh --install "${NETDATA_INSTALL_PARENT}" \ --dont-start-it \ ${NULL} +# Remove the netdata.conf file from the tree. It has hard-coded sensible defaults builtin. +rm -f "${NETDATA_INSTALL_PARENT}/etc/netdata/netdata.conf" + if [ ${NETDATA_BUILD_WITH_DEBUG} -eq 0 ] then run strip ${NETDATA_INSTALL_PATH}/bin/netdata |