Release candidate for 2.0.9

esxi-install.sh

@@ -9,6 +9,10 @@ echo Copyright: Dave Parsons 2011-16
 # Ensure we only use unmodified commands
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 
+# Ensure we run from the patcher directory
+cd "`dirname $0`"
+
+ # Create tmp folder for patching the files
 echo Creating unlocker vmtar disk
 
 # Create tmp folder for patching the files
@@ -18,23 +22,25 @@ mkdir -p tmp/lib
 cp -v /bin/vmx tmp/bin
 cp -v /bin/vmx-debug tmp/bin
 cp -v /bin/vmx-stats tmp/bin
-cp -v /lib/libvmkctl.so tmp/lib
 
-if [ -f /lib64/libvmkctl.so ]; then
+# Now using sed in the local.sh script
-    mkdir -p tmp/lib64
+#cp -v /lib/libvmkctl.so tmp/lib
-    cp -v /lib64/libvmkctl.so tmp/lib64
+#
-fi
+#if [ -f /lib64/libvmkctl.so ]; then
+#    mkdir -p tmp/lib64
+#    cp -v /lib64/libvmkctl.so tmp/lib64
+#fi
 
 # Patch the files
 python unlocker.py
 
 # Create the vmtar file for ESXi kernel
-if [ -f /lib64/libvmkctl.so ]; then
+#if [ -f /lib64/libvmkctl.so ]; then
-    tar cvf tmp/unlocker.tar -C tmp bin lib lib64
+#    tar cvf tmp/unlocker.tar -C tmp bin lib lib64
-else
+#else
-    tar cvf tmp/unlocker.tar -C tmp bin lib
+#    tar cvf tmp/unlocker.tar -C tmp bin lib
-fi
+#fi
-
+tar cvf tmp/unlocker.tar -C tmp bin
 vmtar -c tmp/unlocker.tar -v -o tmp/unlocker.vmtar
 gzip tmp/unlocker.vmtar
 mv tmp/unlocker.vmtar.gz tmp/unlocker.vgz

local.sh

@@ -8,6 +8,13 @@ echo Copyright: Dave Parsons 2011-16
 
 /etc/init.d/hostd status
 /etc/init.d/hostd stop
+
 vmkramdisk /bootbank/unlocker.vgz
+
+sed -i 's/applesmc/vmkernel/g' /lib/libvmkctl.so
+if [ -f /lib64/libvmkctl.so ]; then
+    sed -i 's/applesmc/vmkernel/g' /lib64/libvmkctl.so
+fi
+
 /etc/init.d/hostd start
 /etc/init.d/hostd status

smctest.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-vim-cmd hostsvc/hosthardware | grep smcPresent
+vim-cmd hostsvc/hosthardware | grep smcPresent | cut -d ',' -f 1 | sed 's/^[ \t]*//'

unlocker.py

@@ -413,13 +413,14 @@ def main():
     else:
         print('Patching vmwarebase is not required on this system')
 
-    if osname == 'vmkernel':
+    # Now using sed in the local.sh script
-        # Patch ESXi 6.0 and 6.5 32 bit .so
+    # if osname == 'vmkernel':
-        patchvmkctl(libvmkctl32)
+    #     # Patch ESXi 6.0 and 6.5 32 bit .so
-
+    #     patchvmkctl(libvmkctl32)
-        # Patch ESXi 6.5 64 bit .so
+    #
-        if os.path.isfile(libvmkctl64):
+    #     # Patch ESXi 6.5 64 bit .so
-            patchvmkctl(libvmkctl64)
+    #     if os.path.isfile(libvmkctl64):
+    #         patchvmkctl(libvmkctl64)
 
 
 if __name__ == '__main__':