Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Adding mount size #48

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Adding mount size #48

Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4743499
Adding mount size
lkunjumon Apr 7, 2021
707747d
Updating mount size
lkunjumon Apr 27, 2021
8438c34
Align mount_size to next power of 2
lkunjumon Apr 28, 2021
d4f43e9
Updating mount_size in Gb
lkunjumon Apr 28, 2021
d9de9b3
updating mount size
lkunjumon Apr 28, 2021
98312e7
update command to get actual size of compressed image.
lkunjumon May 17, 2021
06c2388
updating image size check
lkunjumon May 18, 2021
da11766
Add paddig to image size
lkunjumon May 19, 2021
538f077
Added comments for padding
lkunjumon May 19, 2021
884b169
Updated padding
lkunjumon May 19, 2021
3eca178
Updating coment for padding
lkunjumon May 19, 2021
1d62e3f
update command
lkunjumon May 19, 2021
d36f8aa
update command
lkunjumon May 19, 2021
4f36d57
Updating mount size
lkunjumon Jun 15, 2021
02227f0
update mountsize in MB and added 32MB extra free space for image extr…
lkunjumon Jun 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions installer/sharch_body.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ if [ "$sha1" != "$payload_sha1" ] ; then
fi

echo " OK."
#Image size in KB
bytes=$((($(sed -e '1,/^exit_marker$/d' "$0" | tar --to-stdout -xf - | wc -c) + 1023 ) / 1024))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see QiLuo's change... no need to converto to KB

Copy link
Author

@lkunjumon lkunjumon Jun 15, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@antony-rheneus

Below is his comments,
Here it is dividing one time only with 1024, and mouting size in MB
bytes = $(sed -e '1,/^exit_marker$/d' "$0" | tar --to-stdout -xf - | wc -c)
image_size=$((bytes + 1023) / 1024)
mount_size=$((image_size + 31) / 32) * 32
mount -o remount,size="${mount_size}M"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change variable name bytes to "image_size_in_kb"

#Image size in MB
image_size=$(((bytes + 1023) / 1024))

# Untar and launch install script in a tmpfs
cur_wd=$(pwd)
Expand All @@ -32,6 +36,13 @@ 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)
Copy link
Contributor

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??

Copy link
Author

@lkunjumon lkunjumon Apr 7, 2021 •
edited
Loading

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#

Copy link
Author

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.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mount_size is in KB

#checking extra 100KB space in tmp_dir, after image extraction
padding=102400
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

write the size value, also in the comment in KBs or MBs

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not adding, only checking extra space after extraction

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@antony-rheneus pls review the comments

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@antony-rheneus Please review updated commit.

if [ "$mount_size" -le "$((image_size + padding))" ]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comparing KB and MB

mount_size=$((((image_size + 31) / 32) * 32))
mount -o remount,size="${mount_size}M" -t tmpfs tmpfs-installer $tmp_dir || exit 1
fi
fi
cd $tmp_dir
echo -n "Preparing image archive ..."
Expand Down