Update to 0.9.5

ra1nstorm · Nov 28, 2019 · 2b96abd · 2b96abd
1 parent 76c7f48
commit 2b96abd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/stage1/main.iss b/stage1/main.iss
@@ -1,8 +1,8 @@
 #pragma include __INCLUDE__ + ";" + "idp\"
 [Setup]
 AppName                = ra1nstorm
-AppVerName             = 0.9.4
-AppVersion             = 0.9.4
+AppVerName             = 0.9.5
+AppVersion             = 0.9.5
 DefaultDirName         = {sd}\ra1nstorm
 DefaultGroupName       = ra1nstorm
 DisableDirPage         = yes

diff --git a/stage2/BootVM.sh b/stage2/BootVM.sh
@@ -10,6 +10,15 @@ cd /opt/ra1nstorm
 . vmconfig.sh
 cd OSX-KVM
 
-ls /sys/kernel/iommu_groups/*/* 2>&1 >/dev/null || zenity --error --title "ra1nstorm" --text "Failed to initialize IOMMU. Please make sure IOMMU (or VT-d) is enabled in the advanced settings in your BIOS." --width 800 --height 480
+IOMMUERR="IOMMU (VT-d/SR-IOV) is either not supported by your computer or disabled in the BIOS.
+
+Please make sure you have the <b>VT-d</b> or <b>SR-IOV</b> options enabled. They are <b>NOT</b> the same as virtualization technology or VT-x.
+
+Your CPU model is: $(lscpu | grep "Model name" | cut -d: -f2 | sed -E 's/^[ ]+//').
+Please check Intel or AMD's website to see if your CPU supports IOMMU technology.
+"
+
+test -d /opt/ra1nstorm && ls /sys/kernel/iommu_groups/*/* 2>&1 >/dev/null || zenity --error --title "ra1nstorm" --text "$IOMMUERR" --width 800 --height 480
 sh scripts/vfio-group.sh $(find /sys/kernel/iommu_groups -iname 0000:$PCI | cut -d/ -f5)
 ./boot-macOS-Catalina.sh
+sh scripts/vfio-ungroup.sh $(find /sys/kernel/iommu_groups -iname 0000:$PCI | cut -d/ -f5)
diff --git a/stage2/intro.html b/stage2/intro.html
@@ -1,5 +1,5 @@
 <h1>ra1nstorm</h1>
-<p><i>Setup version 0.9.4</i></p>
+<p><i>Setup</i></p>
 <p>ra1nstorm will now prepare your computer to run checkra1n</p>
 <ol>
 	<li>Check hardware for compatibility</li>

diff --git a/stage2/main.awk b/stage2/main.awk
@@ -99,7 +99,7 @@ function wiz_osxkvm_git(\
 
 function wiz_osxkvm_getdmg(\
 	h,status,failed,NUM) {
-	NUM = 5 # this is awful
+	NUM = 3 # this is awful
 	h = zenity_progress("Downloading components... (this may take a long time)...", 0, gzenity " --ok-label 'Next' --cancel-label 'Back'")
 	print "20" | h
 	print "# Downloading macOS installation image (this WILL take a long time)..." | h
@@ -254,7 +254,7 @@ function main_menu(\
 }
 
 BEGIN {
-	RA1NVER = "0.9.4"
+	RA1NVER = "0.9.5"
 	gtitle = "ra1nstorm"
 	gzenity = "--width 800 --height 480"
 	split("python qemu uml-utilities virt-manager dmg2img git wget libguestfs-tools", REQPKGS, " ")