711 fix for linux

honeynet · Mar 15, 2008 · fc1f6ac · fc1f6ac
1 parent 4ac56b0
commit fc1f6ac
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/capture-server/build.xml b/capture-server/build.xml
@@ -64,6 +64,10 @@
 		   </then>
 		  <else>
 		    <copy file="./libVMwareServerExt.so" todir="${release}"/>
+		    <exec executable="cp">
+		      <arg value="./revert"/>
+		      <arg value="${release}"/>
+		    </exec>
 		  </else>
 		 </if>	
 
@@ -75,6 +79,7 @@
 		<delete dir="${release}"/>
 		<delete>
 			<fileset dir="." includes="revert.exe"/>
+			<fileset dir="." includes="revert"/>
 			<fileset dir="." includes="CaptureServer-Release.zip"/>
 		</delete>
     </target>

diff --git a/capture-server/capture/VMwareServer.java b/capture-server/capture/VMwareServer.java
@@ -104,7 +104,7 @@ public void run() {
                         if(System.getProperty("os.name","Windows").toLowerCase().contains("windows")) {
                             cmd = "revert.exe";
                         } else {
-                            cmd = "revert";
+                            cmd = "./revert";
                         }
                         final String[] revertCmd = {cmd, address, username, password, vmPath, guestUsername, guestPassword, guestCmd, cmdOptions};
 

diff --git a/capture-server/compile_revert_linux.sh b/capture-server/compile_revert_linux.sh
@@ -1,4 +1,3 @@
 #!/bin/sh
 echo $VIX_INCLUDE
-gcc -I $JAVA_HOME/include -I $JAVA_HOME/include/linux -I $VIX_INCLUDE VMwareServerExt.c -c -g
-gcc -shared $VIX_LIB/libvmware-vix.so VMwareServerExt.o -o libVMwareServerExt.so -ldl
+gcc -I $VIX_INCLUDE -o revert revert.c $VIX_LIB/libvmware-vix.so