[fix] allow perfwrapper for all commands

!27 caused the perfwrapper to only be activated for the command that
creates a container, and never for the other commands launched in an
already running container. This patch restore this feature.

nrm/containers.py

@@ -102,13 +102,6 @@ class ContainerManager(object):
             container_power['slowdown'] = None
             container_power['manager'] = None
 
-            # It would've been better if argo-perf-wrapper wrapped around
-            # argo-nodeos-config and not the final command -- that way it would
-            # be running outside of the container.  However, because
-            # argo-nodeos-config is suid root, perf can't monitor it.
-            if manifest.is_feature_enabled('perfwrapper'):
-                argv.append(self.perfwrapper)
-
             if manifest.is_feature_enabled('power'):
                 pp = manifest.app.isolators.power
                 if pp.profile in ["1", "True"]:
@@ -143,6 +136,13 @@ class ContainerManager(object):
             else:
                 environ['NRM_DAMPER'] = pp.damper
 
+        # It would've been better if argo-perf-wrapper wrapped around
+        # argo-nodeos-config and not the final command -- that way it would
+        # be running outside of the container.  However, because
+        # argo-nodeos-config is suid root, perf can't monitor it.
+        if manifest.is_feature_enabled('perfwrapper'):
+            argv.append(self.perfwrapper)
+
         # Use hwloc-bind to launch each process in the conatiner by prepending
         # it as an argument to the command line, if enabled in manifest.
         # The hardware binding computed using hwloc-distrib is used here