twh_eastasia/virtual-dsm
1
0
Fork 0
mirror of https://github.com/vdsm/virtual-dsm.git synced 2025-06-06 08:27:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: Improve CPU detection (#829)

Browse Source
This commit is contained in:
Kroese 2024-10-14 18:06:02 +02:00 committed by GitHub
parent d4bf83ae86
commit 5e8bcda9fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/network.sh
View File

@ -239,7 +239,7 @@ configureNAT() {
NET_OPTS+=",script=no,downscript=no" NET_OPTS+=",script=no,downscript=no"
! configureDNS && return 1 configureDNS || return 1
return 0 return 0
} }
@ -376,7 +376,7 @@ if [[ "$DHCP" == [Yy1]* ]]; then
fi fi
# Configure for macvtap interface # Configure for macvtap interface
! configureDHCP && exit 20 configureDHCP || exit 20
MSG="Booting DSM instance..." MSG="Booting DSM instance..."
html "$MSG" html "$MSG"
@ -412,7 +412,7 @@ else
if [[ "${NETWORK,,}" == "user"* ]]; then if [[ "${NETWORK,,}" == "user"* ]]; then
# Configure for usermode networking (slirp) # Configure for usermode networking (slirp)
! configureUser && exit 24 configureUser || exit 24
fi fi

3
src/reset.sh
View File

@ -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') 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 fi
[ -z "${CPU// /}" ] && CPU="Unknown" CPU="${CPU// Quad core CPU/}"
CPU="${CPU// with Radeon Graphics/}" CPU="${CPU// with Radeon Graphics/}"
[ -z "${CPU// /}" ] && CPU="Unknown"
# Check system # Check system