Unverified Commit 36f1e47c authored by Kroese's avatar Kroese Committed by GitHub
Browse files

fix: Check for Podman IP ranges (#745)

parent c5dd5c2e

src/disk.sh

+1 −0
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ createDevice () { 
    "usb" )

      result="$result \

      -device usb-storage,drive=${DISK_ID}${index}"

      echo "$result"

      ;;

    "ide" )

      result="$result \

src/network.sh

+3 −3
Original line number Diff line number Diff line
@@ -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