From 36f1e47c0a30255148e5838a5cc2301212fff633 Mon Sep 17 00:00:00 2001 From: Kroese Date: Tue, 21 May 2024 13:48:05 +0200 Subject: [PATCH] fix: Check for Podman IP ranges (#745) --- src/disk.sh | 1 + src/network.sh | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/disk.sh b/src/disk.sh index 6910459..5b3d329 100644 --- a/src/disk.sh +++ b/src/disk.sh @@ -365,6 +365,7 @@ createDevice () { "usb" ) result="$result \ -device usb-storage,drive=${DISK_ID}${index}" + echo "$result" ;; "ide" ) result="$result \ diff --git a/src/network.sh b/src/network.sh index 8f2e1f9..a0a2a44 100644 --- a/src/network.sh +++ b/src/network.sh @@ -327,7 +327,7 @@ fi if [[ "$DHCP" == [Yy1]* ]]; then - ! checkOS && exit 19 + ! checkOS && [[ "$DEBUG" != [Yy1]* ]] && 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)!" @@ -341,8 +341,8 @@ if [[ "$DHCP" == [Yy1]* ]]; then else - if [[ "$GATEWAY" != "172."* ]] && [[ "$GATEWAY" != "10."* ]]; then - ! checkOS && exit 19 + if [[ "$GATEWAY" != "172."* ]] && [[ "$GATEWAY" != "10.8"* ]] && [[ "$GATEWAY" != "10.9"* ]]; then + ! checkOS && [[ "$DEBUG" != [Yy1]* ]] && exit 19 fi # Shutdown nginx