diff --git a/included.cfg b/included.cfg index dbd2408..7aa0c75 100644 --- a/included.cfg +++ b/included.cfg @@ -4,6 +4,7 @@ script=included_script.sh [sysctl] type=sysctl net.core.rmem_max = 8388609 +replace=1 [my_included_plugin] type=test diff --git a/test.cfg b/test.cfg index 2eaf762..d15cd88 100644 --- a/test.cfg +++ b/test.cfg @@ -4,7 +4,7 @@ script=script.sh elevator=deadline [my_sysctl] -merge=1 +replace=1 type=sysctl # ktune sysctl settings for EL 5 servers diff --git a/tuned/profile.py b/tuned/profile.py index 10aa3ab..7289504 100644 --- a/tuned/profile.py +++ b/tuned/profile.py @@ -102,11 +102,11 @@ class Profile(object): else: plugin_cfg["devices"] = plugin_cfg["devices"].split(",") - if plugin_cfg.has_key("merge"): - self._merge_plugin(name, plugin_cfg) - del plugin_cfg["merge"] - else: + if plugin_cfg.has_key("replace"): self._replace_plugin(name, plugin_cfg) + del plugin_cfg["replace"] + else: + self._merge_plugin(name, plugin_cfg) self._plugin_configs[name] = plugin_cfg def _apply_config(self):