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

feat: Print warning based on OS #726

Merged
merged 4 commits into from
May 11, 2024
Merged

feat: Print warning based on OS #726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46b8ecd
feat: Detect Windows and MacOS
kroese May 11, 2024
f0ee63c
Update network.sh
kroese May 11, 2024
cd296b6
feat: Detect MacOS
kroese May 11, 2024
b23aaa3
feat: Detect Docker for Windows
kroese May 11, 2024
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
23 changes: 23 additions & 0 deletions src/network.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,23 @@ closeNetwork() {
return 0
}

checkOS() {

local name
local os=""
name=$(uname -a)

[[ "${name,,}" == *"darwin"* ]] && os="MacOS"
[[ "${name,,}" == *"microsoft"* ]] && os="Windows"

if [ -n "$os" ]; then
error "You are using Docker Desktop for $os which does not support macvlan, please revert to bridge networking!"
return 1
fi

return 0
}

getInfo() {

if [ -z "$VM_NET_DEV" ]; then
Expand Down Expand Up @@ -306,6 +323,8 @@ fi

if [[ "$DHCP" == [Yy1]* ]]; then

! checkOS && exit 19

if [[ "$GATEWAY" == "172."* ]]; then
warn "your gateway IP starts with 172.* which is often a sign that you are not on a macvlan network (required for DHCP)!"
fi
Expand All @@ -318,6 +337,10 @@ if [[ "$DHCP" == [Yy1]* ]]; then

else

if [[ "$GATEWAY" != "172."* ]]; then
! checkOS && exit 19
fi

# Shutdown nginx
nginx -s stop 2> /dev/null
fWait "nginx"
Expand Down
14 changes: 11 additions & 3 deletions src/proc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,17 @@ if [[ "$KVM" != [Nn]* ]]; then

if [ -n "$KVM_ERR" ]; then
KVM="N"
error "KVM acceleration not available $KVM_ERR, this will cause a major loss of performance."
error "See the FAQ on how to enable it, or continue without KVM by setting KVM=N (not recommended)."
[[ "$DEBUG" != [Yy1]* ]] && exit 88
if [[ "$OSTYPE" =~ ^darwin ]]; then
warn "you are using MacOS which has no KVM support, this will cause a major loss of performance."
else
if grep -qi Microsoft /proc/version; then
warn "you are using Windows 10 which has no KVM support, this will cause a major loss of performance."
else
error "KVM acceleration not available $KVM_ERR, this will cause a major loss of performance."
error "See the FAQ on how to enable it, or continue without KVM by setting KVM=N (not recommended)."
[[ "$DEBUG" != [Yy1]* ]] && exit 88
fi
fi
fi

fi
Expand Down