Strict patch #2968
Closed
Strict patch #2968
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ktsakalozos
force-pushed
the
MK-342/split-core-addons-strict
branch
8 times, most recently
from
68cfa91 to
ccb645c
Compare
ktsakalozos
force-pushed
the
MK-342/split-core-addons-strict
branch
2 times, most recently
from
65e6182 to
9e378a5
Compare
neoaggelos
reviewed
Mar 18, 2022
| @@ -123,7 +123,7 @@ refresh_opt_in_local_config() { | |||
| if $(grep -qE "^$opt=" $config_file); then | |||
| run_with_sudo "$SNAP/bin/sed" -i "s@^$opt=.*@$replace_line@" $config_file | |||
| else | |||
| run_with_sudo "$SNAP/bin/sed" -i "$ a $replace_line" "$config_file" | |||
| run_with_sudo "$SNAP/bin/sed" -i "1i$replace_line" "$config_file" | |||
There was a problem hiding this comment.
Yes, this is on purpose. The way run_with_sudo works at the moment does not allow for spaces in the arguments passed.
Comment on lines
669
to
678
| if (is_strict) | ||
| then | ||
| snapctl kill snap.microk8s.daemon-kubelite.service --signal=SIGKILL &>/dev/null || true | ||
| snapctl kill snap.microk8s.daemon-kubelet.service --signal=SIGKILL &>/dev/null || true | ||
| snapctl kill snap.microk8s.daemon-containerd.service --signal=SIGKILL &>/dev/null || true | ||
| else | ||
| run_with_sudo systemctl kill snap.microk8s.daemon-kubelite.service --signal=SIGKILL &>/dev/null || true | ||
| run_with_sudo systemctl kill snap.microk8s.daemon-kubelet.service --signal=SIGKILL &>/dev/null || true | ||
| run_with_sudo systemctl kill snap.microk8s.daemon-containerd.service --signal=SIGKILL &>/dev/null || true | ||
| fi |
There was a problem hiding this comment.
Can this diff be reduced already?
ktsakalozos
force-pushed
the
MK-342/split-core-addons-strict
branch
from
9e378a5 to
bab9881
Compare
|
The PR #2996 is to be used from now on. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.