From c9fc7b2410178e532dbbfc02a6e270d352abd085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 29 Nov 2012 15:17:45 +0100 Subject: [PATCH] plugins: removed _load_path --- tuned/plugins/plugin_script.py | 5 +---- tuned/plugins/plugin_sysctl.py | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/tuned/plugins/plugin_script.py b/tuned/plugins/plugin_script.py index 8e83c0a..9948060 100644 --- a/tuned/plugins/plugin_script.py +++ b/tuned/plugins/plugin_script.py @@ -16,10 +16,7 @@ class ScriptPlugin(base.Plugin): if self._options["script"] is None: return - if self._options["script"].startswith("/"): - self._scripts.append(self._options["script"]) - else: - self._scripts.append(os.path.join(self._options["_load_path"], self._options["script"])) + self._scripts.append(self._options["script"]) @classmethod def tunable_devices(self): diff --git a/tuned/plugins/plugin_sysctl.py b/tuned/plugins/plugin_sysctl.py index 0f38fba..b3e7e3a 100644 --- a/tuned/plugins/plugin_sysctl.py +++ b/tuned/plugins/plugin_sysctl.py @@ -14,7 +14,6 @@ class SysctlPlugin(base.Plugin): self._dynamic_tuning = False self._sysctl_original = {} self._sysctl = self._options - del self._sysctl["_load_path"] # TODO: drop this ugly hack! old_sysctl_options = self._storage.get("options", {}) for key, value in old_sysctl_options.iteritems():