Fix LXC installation (fixes #41) #42
Open
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
|
!testme |
|
Alrighty! |
|
📚 🪱 |
fflorent
requested changes
Aug 25, 2024
| @@ -49,7 +49,7 @@ ynh_script_progression --message="Increasing maximum map count (sysctl)..." | |||
| # Increase the maximum number of files inotify can monitor. | |||
| cp -a ../conf/90-max_map_count-elasticsearch.conf /etc/sysctl.d/ | |||
| # Then, reload the kernel configuration. | |||
| if ! [ "${container:-}" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. | |||
| if ! [ "$(systemd-detect-virt)" == "lxc" ] # lxc doesn't allow sysctl to play with kernel options. | |||
There was a problem hiding this comment.
Are you sure that it works? I don't see the == operator in man test page.
Otherwise, I propose this change:
Suggested change
| if ! [ "$(systemd-detect-virt)" == "lxc" ] # lxc doesn't allow sysctl to play with kernel options. | |
| if [ "$(systemd-detect-virt)" != "lxc" ] # lxc doesn't allow sysctl to play with kernel options. |
Which improves the readability.
There was a problem hiding this comment.
Well, it worked for me, and I just reused what's been done in the mastodon app here
There was a problem hiding this comment.
Right, I see that indeed both = and == are equivalent:
https://stackoverflow.com/questions/20449543/shell-equality-operators-eq
| @@ -31,7 +31,7 @@ ynh_remove_logrotate | |||
| if [ -e "/etc/sysctl.d/90-max_map_count-elasticsearch.conf" ]; then | |||
| ynh_secure_remove --file="/etc/sysctl.d/90-max_map_count-elasticsearch.conf" | |||
| # Reload the kernel configuration. | |||
| if ! [ "${container:-}" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. | |||
| if ! [ "$(systemd-detect-virt)" == "lxc" ] # lxc doesn't allow sysctl to play with kernel options. | |||
There was a problem hiding this comment.
Suggested change
| if ! [ "$(systemd-detect-virt)" == "lxc" ] # lxc doesn't allow sysctl to play with kernel options. | |
| if [ "$(systemd-detect-virt)" != "lxc" ] # lxc doesn't allow sysctl to play with kernel options. |
| @@ -37,7 +37,7 @@ chown -R $app:www-data "$data_dir" | |||
| ynh_script_progression --message="Restoring various files..." --weight=1 | |||
|
|
|||
| ynh_restore_file --origin_path="/etc/sysctl.d/90-max_map_count-elasticsearch.conf" | |||
| if ! [ "${container:-}" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. | |||
| if ! [ "$(systemd-detect-virt)" == "lxc" ] # lxc doesn't allow sysctl to play with kernel options. | |||
There was a problem hiding this comment.
Suggested change
| if ! [ "$(systemd-detect-virt)" == "lxc" ] # lxc doesn't allow sysctl to play with kernel options. | |
| if [ "$(systemd-detect-virt)" != "lxc" ] # lxc doesn't allow sysctl to play with kernel options. |
| @@ -65,7 +65,7 @@ ynh_script_progression --message="Increasing maximum map count (sysctl)..." | |||
| # Increase the maximum number of files inotify can monitor. | |||
| cp -a ../conf/90-max_map_count-elasticsearch.conf /etc/sysctl.d/ | |||
| # Then, reload the kernel configuration. | |||
| if ! [ "${container:-}" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. | |||
| if ! [ "$(systemd-detect-virt)" == "lxc" ] # lxc doesn't allow sysctl to play with kernel options. | |||
There was a problem hiding this comment.
Suggested change
| if ! [ "$(systemd-detect-virt)" == "lxc" ] # lxc doesn't allow sysctl to play with kernel options. | |
| if [ "$(systemd-detect-virt)" != "lxc" ] # lxc doesn't allow sysctl to play with kernel options. |
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.
Problem
Solution
PR Status
Automatic tests
Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ after creating the PR, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization)