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

fix: Podman detection (#990)
Some checks failed
Build / Check (push) Has been cancelled
Details
Build / Build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Kroese 2025-05-27 00:50:40 +02:00 committed by GitHub
parent 631a558a9f
commit 1b8054e847
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/disk.sh
View File

@ -320,7 +320,7 @@ convertDisk() {
msg="Conversion of $DISK_DESC" msg="Conversion of $DISK_DESC"
html "$msg completed..." html "$msg completed..."
info "$msg to $DST_FMT completed succesfully!" info "$msg to $DST_FMT completed successfully!"
return 0 return 0
} }

3
src/network.sh
View File

@ -209,8 +209,9 @@ configureNAT() {
# Check port forwarding flag # Check port forwarding flag
if [[ $(< /proc/sys/net/ipv4/ip_forward) -eq 0 ]]; then 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 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" error "IP forwarding is disabled. $ADD_ERR --sysctl net.ipv4.ip_forward=1"
return 1 return 1
fi fi

3
src/utils.sh
View File

@ -130,7 +130,10 @@ cpu() {
cpu="${cpu// 12 Core/}" cpu="${cpu// 12 Core/}"
cpu="${cpu// 16 Core/}" cpu="${cpu// 16 Core/}"
cpu="${cpu// 32 Core/}" cpu="${cpu// 32 Core/}"
cpu="${cpu// 48 Core/}"
cpu="${cpu// 64 Core/}" cpu="${cpu// 64 Core/}"
cpu="${cpu// 96 Core/}"
cpu="${cpu// 128 Core/}"
cpu="${cpu//7th Gen /}" cpu="${cpu//7th Gen /}"
cpu="${cpu//8th Gen /}" cpu="${cpu//8th Gen /}"
cpu="${cpu//9th Gen /}" cpu="${cpu//9th Gen /}"