Unverified Commit 1b8054e8 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

fix: Podman detection (#990)

parent 631a558a

src/disk.sh

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ convertDisk() { 


  msg="Conversion of $DISK_DESC"

  html "$msg completed..."

  info "$msg to $DST_FMT completed succesfully!"

  info "$msg to $DST_FMT completed successfully!"



  return 0

}

src/network.sh

+2 −1
Original line number Diff line number Diff line
@@ -209,8 +209,9 @@ configureNAT() { 


  # Check port forwarding flag

  if [[ $(< /proc/sys/net/ipv4/ip_forward) -eq 0 ]]; then

    { sysctl -w net.ipv4.ip_forward=1 > /dev/null; rc=$?; } || :

    { sysctl -w net.ipv4.ip_forward=1 > /dev/null 2>&1; rc=$?; } || :

    if (( rc != 0 )) || [[ $(< /proc/sys/net/ipv4/ip_forward) -eq 0 ]]; then

      [[ "$PODMAN" == [Yy1]* ]] && return 1

      error "IP forwarding is disabled. $ADD_ERR --sysctl net.ipv4.ip_forward=1"

      return 1

    fi

src/utils.sh

+3 −0
Original line number Diff line number Diff line
@@ -130,7 +130,10 @@ cpu() { 
  cpu="${cpu// 12 Core/}"

  cpu="${cpu// 16 Core/}"

  cpu="${cpu// 32 Core/}"

  cpu="${cpu// 48 Core/}"

  cpu="${cpu// 64 Core/}"

  cpu="${cpu// 96 Core/}"

  cpu="${cpu// 128 Core/}"

  cpu="${cpu//7th Gen /}"

  cpu="${cpu//8th Gen /}"

  cpu="${cpu//9th Gen /}"