From c6663a517e47d5cb857bea1d84acea4745a7e38f Mon Sep 17 00:00:00 2001
From: bol-van <none@none.none>
Date: Wed, 13 Apr 2022 11:47:14 +0300
Subject: [PATCH] virt checks in both install_easy and blockcheck

---
 blockcheck.sh   |  2 ++
 common/virt.sh  | 39 +++++++++++++++++++++++++++++++++++++++
 install_easy.sh | 31 +------------------------------
 3 files changed, 42 insertions(+), 30 deletions(-)
 create mode 100644 common/virt.sh

diff --git a/blockcheck.sh b/blockcheck.sh
index 54d94e2..3716ef6 100755
--- a/blockcheck.sh
+++ b/blockcheck.sh
@@ -9,6 +9,7 @@ ZAPRET_BASE="$EXEDIR"
 . "$ZAPRET_BASE/common/dialog.sh"
 . "$ZAPRET_BASE/common/elevate.sh"
 . "$ZAPRET_BASE/common/fwtype.sh"
+. "$ZAPRET_BASE/common/virt.sh"
 
 [ -n "$QNUM" ] || QNUM=59780
 [ -n "$TPPORT" ] || TPPORT=993
@@ -1005,6 +1006,7 @@ check_system
 require_root
 check_prerequisites
 check_dns
+check_virt
 ask_params
 
 PID=
diff --git a/common/virt.sh b/common/virt.sh
new file mode 100644
index 0000000..bb70cb3
--- /dev/null
+++ b/common/virt.sh
@@ -0,0 +1,39 @@
+get_virt()
+{
+	local vm s v UNAME
+	UNAME=$(uname)
+	case "$UNAME" in
+		Linux)
+			if exists systemd-detect-virt; then
+				vm=$(systemd-detect-virt --vm)
+			elif [ -f /sys/class/dmi/id/product_name ]; then
+				read s </sys/class/dmi/id/product_name
+				for v in KVM QEMU VMware VMW VirtualBox Xen Bochs Parallels BHYVE Hyper-V; do
+					case "$s" in
+						"$v"*)
+						vm=$v
+						break
+		    			;;
+					esac
+				done
+			fi
+			;;
+	esac
+	echo "$vm"
+}
+check_virt()
+{
+	echo \* checking virtualization
+	local vm=$(get_virt)
+	if [ -n "$vm" ]; then
+		if [ "$vm" = "none" ]; then
+			echo running on bare metal
+		else
+			echo "!!! WARNING. $vm virtualization detected !!!"
+			echo '!!! WARNING. vmware and virtualbox are known to break most of the DPI bypass techniques when network is NATed using internal hypervisor NAT !!!'
+			echo '!!! WARNING. if this is your case make sure you are bridged not NATed !!!'
+		fi
+	else
+		echo cannot detect
+	fi
+}
diff --git a/install_easy.sh b/install_easy.sh
index 431ec94..38c2429 100755
--- a/install_easy.sh
+++ b/install_easy.sh
@@ -15,6 +15,7 @@ ZAPRET_BASE="$EXEDIR"
 . "$ZAPRET_BASE/common/dialog.sh"
 . "$ZAPRET_BASE/common/ipt.sh"
 . "$ZAPRET_BASE/common/installer.sh"
+. "$ZAPRET_BASE/common/virt.sh"
 
 # install target
 ZAPRET_TARGET=/opt/zapret
@@ -672,36 +673,6 @@ check_dns()
 	return 0
 }
 
-check_virt()
-{
-	echo \* checking virtualization
-	local vm s v
-	if exists systemd-detect-virt; then
-		vm=$(systemd-detect-virt --vm)
-	elif [ -f /sys/class/dmi/id/product_name ]; then
-		read s </sys/class/dmi/id/product_name
-		for v in KVM QEMU VMware VMW VirtualBox Xen Bochs Parallels BHYVE Hyper-V; do
-			case "$s" in
-				"$v"*)
-				vm=$v
-				break
-    			;;
-			esac
-		done
-	fi
-	if [ -n "$vm" ]; then
-		if [ "$vm" = "none" ]; then
-			echo running on bare metal
-		else
-			echo "!!! WARNING. $vm virtualization detected !!!"
-			echo '!!! WARNING. vmware and virtualbox are known to break most of the DPI bypass techniques when network is NATed using internal hypervisor NAT !!!'
-			echo '!!! WARNING. if this is your case make sure you are bridged not NATed !!!'
-		fi
-	else
-		echo cannot detect
-	fi
-}
-
 
 install_systemd()
 {