-
Notifications
You must be signed in to change notification settings - Fork 5.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
kickstart: pass options to installer #7051
kickstart: pass options to installer #7051
Conversation
- pass --stable-channel option - append --dont-wait option to list of passthrough options
Manage this branch in SquashTest this branch here: https://oxplotpass-stable-channel-opt-ogc2j.squash.io |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for this. You need to update kickstart-static64.sh
too tho, as that was also reported to be failing. Did you check that case too?
we also need the checksum info to be updated on packaging/installer/readme.md when modifying kickstarts |
Also @paulkatsoulakis please ensure that @knatsakis knows how to update the two scripts, once the PR is merged. |
This looks like a good fix for kickstart.sh. But the case with kickstart-static64.sh is more complicated. kickstart.sh does generate In the second case the |
@oxplot please sign the CLA |
@@ -194,6 +194,7 @@ while [ -n "${1}" ]; do | |||
shift 1 | |||
elif [ "${1}" = "--stable-channel" ]; then | |||
RELEASE_CHANNEL="stable" | |||
inner_opts="${inner_opts} ${1}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @oxplot, are you sure that the inner script accepts the "--stable-channel" option?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh I see — I wrongly assumed based on #7051 (review) that both scripts behave the same.
I suggest then to only fix kickstart and leave kickstart-static64 for another PR, given how trivial this fix is (so it doesn't drag on).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If i may say, @knatsakis if we have decided that through netdata-updater.sh for the static install, we want to automatically set the release channel variable in .environment to stable, when the user uses the stable flag so that updater is automatically pulling stable releases, then it makes sense to add the option. But to make it complete we will need to add handling on the other side too (makeself installer).
If we agree that we do not want to automatically force the stable release channel on the static install, as it was the initial decision with @cakrit when we fixed the updater to work for the static install, then indeed no need to add it to inner opts
Hello, We 've already discussed the details with @knatsakis earlier today, but feel free to ping me should you need more help or documentation |
@@ -307,6 +307,7 @@ while [ -n "${1}" ]; do | |||
shift 1 | |||
elif [ "${1}" = "--stable-channel" ]; then | |||
RELEASE_CHANNEL="stable" | |||
NETDATA_INSTALLER_OPTIONS="$NETDATA_INSTALLER_OPTIONS --stable-channel" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you make this so that it doesn't add an extra space when $NETDATA_INSTALLER_OPTIONS
is empty?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is harmless in bash and spaces are collapsed. I don't think it justifies the extra fluff. Also, https://github.com/netdata/netdata/blob/master/packaging/installer/kickstart-static64.sh#L193 seems to do the same.
@@ -351,7 +352,7 @@ done | |||
|
|||
if [ "${INTERACTIVE}" = "0" ]; then | |||
PACKAGES_INSTALLER_OPTIONS="--dont-wait --non-interactive ${PACKAGES_INSTALLER_OPTIONS}" | |||
NETDATA_INSTALLER_OPTIONS="--dont-wait" | |||
NETDATA_INSTALLER_OPTIONS="$NETDATA_INSTALLER_OPTIONS --dont-wait" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The same here: could you make this so that it doesn't add an extra space when $NETDATA_INSTALLER_OPTIONS
is empty?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See my other comment
are we happy to leave changes to static64 to another PR? |
Yes, please leave changes to static64 to another PR. |
* kickstart: pass options to installer - pass --stable-channel option - append --dont-wait option to list of passthrough options * kickstart: passthrough --stable-channel in static64 * kickstart: update checksums in readme * Revert "kickstart: passthrough --stable-channel in static64" This reverts commit 678ebba. * Revert kickstart-static64 checksum update
* kickstart: pass options to installer - pass --stable-channel option - append --dont-wait option to list of passthrough options * kickstart: passthrough --stable-channel in static64 * kickstart: update checksums in readme * Revert "kickstart: passthrough --stable-channel in static64" This reverts commit 678ebba. * Revert kickstart-static64 checksum update
Summary
Passes through kickstarter options to the installer
Component Name
Packaging - Installer
Additional Information
Fixes #7040