Merge pull request #880 from amousset/bug_7881/rudder_agent_tries_sen…

…ding_an_inventory_during_update Fixes #7881: Rudder agent tries sending an inventory during update
Normation · Feb 8, 2016 · cf1f90c · cf1f90c
2 parents 3a1c6c1 + c9fde67
commit cf1f90c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/rudder-agent/SPECS/rudder-agent.spec b/rudder-agent/SPECS/rudder-agent.spec
@@ -649,8 +649,8 @@ fi
 # Try to send an inventory after upgrade to see the new agent version on the server
 if [ ${CFRUDDER_FIRST_INSTALL} -ne 1 ]
 then
-  echo "INFO: Trigger an inventory..."
-  /var/rudder/cfengine-community/bin/cf-agent -KD force_inventory >> %{rudderlogdir}/install/rudder-agent.log 2>&1 || true
+  echo "INFO: Scheduling an inventory during next run..."
+  touch /opt/rudder/etc/force_inventory
 fi
 
 # launch rudder agent check script, it will generate an UUID on first install or repair it if needed

diff --git a/rudder-agent/debian/postinst b/rudder-agent/debian/postinst
@@ -166,8 +166,8 @@ case "$1" in
     # Try to send an inventory after upgrade to see the new agent version on the server
     if [ ${CFRUDDER_FIRST_INSTALL} -ne 1 ]
     then
-      echo "INFO: Trigger an inventory..."
-      /var/rudder/cfengine-community/bin/cf-agent -KD force_inventory >> /var/log/rudder/install/rudder-agent.log 2>&1 || true
+      echo "INFO: Scheduling an inventory during next run..."
+      touch /opt/rudder/etc/force_inventory
     fi
 
     # launch rudder agent check script, it will generate an UUID on first install or repair it if needed