Adding mount size #48
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,13 +25,21 @@ fi | |
|
|
||
| echo " OK." | ||
|
|
||
| image_size=$(( $(sed -e '1,/^exit_marker$/d' "$0" | tar --to-stdout -xf - | wc -c) / 1024)) | ||
| # Untar and launch install script in a tmpfs | ||
| cur_wd=$(pwd) | ||
| export cur_wd | ||
| archive_path=$(realpath "$0") | ||
| tmp_dir=$(mktemp -d) | ||
| if [ "$(id -u)" = "0" ] ; then | ||
| mount -t tmpfs tmpfs-installer $tmp_dir || exit 1 | ||
| mount_size=$(df $tmp_dir | tail -1 | tr -s ' ' | cut -d' ' -f4) | ||
|
There was a problem hiding this comment. mount_size is in KB |
||
| # Extra space for tmp | ||
| padding=102400 | ||
|
There was a problem hiding this comment. write the size value, also in the comment in KBs or MBs There was a problem hiding this comment. not adding, only checking extra space after extraction There was a problem hiding this comment. @antony-rheneus pls review the comments There was a problem hiding this comment. @antony-rheneus Please review updated commit. |
||
| if [ "$mount_size" -le "$((image_size + padding))" ]; then | ||
|
There was a problem hiding this comment. comparing KB and MB |
||
| mount_size=$((((image_size + padding)/1024/1024)+1)) | ||
|
There was a problem hiding this comment. Here, you dont need to add at all, as already we add up 1G extra |
||
| mount -o remount,size="${mount_size}G" -t tmpfs tmpfs-installer $tmp_dir || exit 1 | ||
| fi | ||
| fi | ||
| cd $tmp_dir | ||
| echo -n "Preparing image archive ..." | ||
|
|
||
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.
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.
What is this logic for? Are you trying to take available space from tmpfs??
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.
@antony-rheneus
yes
mktemp -d
/tmp/tmp.yWbDbATGf2
root@localhost:/home/admin# df /tmp/tmp.yWbDbATGf2
Filesystem 1K-blocks Used Available Use% Mounted on
root-overlay 12147768 3606788 7900860 32% /
root@localhost:/home/admin#
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.
@antony-rheneus Updated mount size depends on image size.