Unverified Commit 5e8bcda9 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

feat: Improve CPU detection (#829)

parent d4bf83ae

src/network.sh

+3 −3
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ configureNAT() { 


  NET_OPTS+=",script=no,downscript=no"



  ! configureDNS && return 1

  configureDNS || return 1



  return 0

}
@@ -376,7 +376,7 @@ if [[ "$DHCP" == [Yy1]* ]]; then 
  fi



  # Configure for macvtap interface

  ! configureDHCP && exit 20

  configureDHCP || exit 20



  MSG="Booting DSM instance..."

  html "$MSG"
@@ -412,7 +412,7 @@ else 
  if [[ "${NETWORK,,}" == "user"* ]]; then



    # Configure for usermode networking (slirp)

    ! configureUser && exit 24

    configureUser || exit 24



  fi

src/reset.sh

+2 −1
Original line number Diff line number Diff line
@@ -62,8 +62,9 @@ if [ -z "${CPU// /}" ] && grep -qi "model:" <<< "$CPI"; then 
  CPU=$(echo "$CPI" | grep -m 1 -i 'model:' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')

fi



[ -z "${CPU// /}" ] && CPU="Unknown"

CPU="${CPU// Quad core CPU/}"

CPU="${CPU// with Radeon Graphics/}"

[ -z "${CPU// /}" ] && CPU="Unknown"



# Check system