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

Installer fix #401

Merged
merged 2 commits into from
Nov 20, 2022
Merged

Installer fix #401

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0c2035
docker dir check in installer
m-1-k-3 Nov 19, 2022
2b0392d
docker dir check in installer
m-1-k-3 Nov 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 13 additions & 3 deletions installer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ if [[ "$STRICT_MODE" -eq 1 ]]; then
if [[ -f "./helpers/helpers_emba_load_strict_settings.sh" ]]; then
# shellcheck source=/dev/null
source ./helpers/helpers_emba_load_strict_settings.sh
elif [[ -f "/emba/helpers/helpers_emba_load_strict_settings.sh" ]]; then
elif [[ -f "/installer/helpers_emba_load_strict_settings.sh" ]]; then
# in docker this is in /emba/...
# shellcheck source=/dev/null
source /emba/helpers/helpers_emba_load_strict_settings.sh
source /installer/helpers_emba_load_strict_settings.sh
else
echo "Warning - strict mode module not found"
fi
Expand Down Expand Up @@ -187,7 +187,15 @@ fi
# quick check if we have enough disk space for the docker image

if [[ "$IN_DOCKER" -eq 0 ]]; then
FREE_SPACE=$(df --output=avail /var/lib/docker/ | awk 'NR==2')
if [[ -d "/var/lib/docker/" ]]; then
# docker is already installed
DDISK="/var/lib/docker"
else
# default
DDISK="/var/lib/"
fi

FREE_SPACE=$(df --output=avail "$DDISK" | awk 'NR==2')
if [[ "$FREE_SPACE" -lt 13000000 ]]; then
echo -e "\\n""$ORANGE""EMBA installation in default mode needs a minimum of 13Gig for the docker image""$NC"
echo -e "\\n""$ORANGE""Please free enough space on /var/lib/docker""$NC"
Expand Down Expand Up @@ -252,6 +260,8 @@ if [[ "$CVE_SEARCH" -ne 1 ]] || [[ "$DOCKER_SETUP" -ne 1 ]] || [[ "$IN_DOCKER" -

IP18_qnap_decryptor

# IP35_uefi_extraction

IP61_unblob

IP99_binwalk_default
Expand Down