Merge pull request #467 from ncharles/bug_5430/dev/run_fusion_on_windows

Fixes #5430: use a wrapper script for fusioninventory on windows, to run...
Normation · Sep 7, 2014 · 48c3032 · 48c3032
2 parents 933889c + 6e57b79
commit 48c3032
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/initial-promises/node-server/inventory/1.0/fusionAgent.cf b/initial-promises/node-server/inventory/1.0/fusionAgent.cf
@@ -160,7 +160,7 @@ bundle agent fusionAgent {
         comment => "Generating inventory, in the temporary folder";
 
     windows::	    
-      "\"c:\Program Files\FusionInventory-Agent\fusioninventory-inventory.bat\""
+      "\"c:\Program Files\Rudder\sbin\run-inventory.bat\""
         args => "--local=\"${g.rudder_var_tmp}\inventory\" --scan-homedirs 2>nul",
         contain => in_shell,
         classes => cf2_if_else("run_inventory", "inventory_failed"),

diff --git a/techniques/system/inventory/1.0/fusionAgent.st b/techniques/system/inventory/1.0/fusionAgent.st
@@ -192,7 +192,7 @@ bundle agent fusionAgent
 
 &if(NOVA)&
     windows::
-      "\"C:\Program Files\FusionInventory-Agent\fusioninventory-inventory.bat\""
+      "\"C:\Program Files\Rudder\sbin\run-inventory.bat\""
         args => "--local=\"${g.rudder_var_tmp}\inventory\" --scan-homedirs 2>nul",
         contain => in_shell,
         classes => cf2_if_else("run_inventory", "inventory_failed"),

diff --git a/tools/run-inventory.bat b/tools/run-inventory.bat
@@ -0,0 +1,7 @@
+@echo off
+REM Runs the Fusion Inventory agent, with the parameters passed in argument
+REM by reparsing it, to solve strange bug between CFEngine and FusionInventory
+
+REM Copyright (c) 2014 Normation SAS.
+
+"c:\Program Files\FusionInventory-Agent\fusioninventory-agent.bat" %*