From 1b8054e8472b3af4fdc311af328eb01ef1658418 Mon Sep 17 00:00:00 2001 From: Kroese Date: Tue, 27 May 2025 00:50:40 +0200 Subject: [PATCH] fix: Podman detection (#990) --- src/disk.sh | 2 +- src/network.sh | 3 ++- src/utils.sh | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/disk.sh b/src/disk.sh index 11db3e8..e1c8084 100644 --- a/src/disk.sh +++ b/src/disk.sh @@ -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 } diff --git a/src/network.sh b/src/network.sh index ff154a5..ceac94f 100644 --- a/src/network.sh +++ b/src/network.sh @@ -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 diff --git a/src/utils.sh b/src/utils.sh index a69500e..70ff6ca 100644 --- a/src/utils.sh +++ b/src/utils.sh @@ -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 /}"