|
 |
7438d5 |
diff --git a/tuned/admin/admin.py b/tuned/admin/admin.py
|
|
|
7438d5 |
index 53f27e7..4db24c4 100644
|
|
|
7438d5 |
--- a/tuned/admin/admin.py
|
|
|
7438d5 |
+++ b/tuned/admin/admin.py
|
|
|
7438d5 |
@@ -125,8 +125,9 @@ class Admin(object):
|
|
|
7438d5 |
print "Verfication succeeded, current system settings match the preset profile."
|
|
|
7438d5 |
else:
|
|
|
7438d5 |
print "Verification failed, current system settings differ from the preset profile."
|
|
|
7438d5 |
- print "See tuned.log for details. You can mostly fix this by Tuned restart, e.g.:"
|
|
|
7438d5 |
+ print "You can mostly fix this by Tuned restart, e.g.:"
|
|
|
7438d5 |
print " service tuned restart"
|
|
|
7438d5 |
+ print "See tuned log file ('%s') for details." % consts.LOG_FILE
|
|
|
7438d5 |
return ret
|
|
|
7438d5 |
|
|
|
7438d5 |
def off(self):
|
|
|
7438d5 |
diff --git a/tuned/plugins/plugin_sysctl.py b/tuned/plugins/plugin_sysctl.py
|
|
|
7438d5 |
index 70f27af..0ee1111 100644
|
|
|
7438d5 |
--- a/tuned/plugins/plugin_sysctl.py
|
|
|
7438d5 |
+++ b/tuned/plugins/plugin_sysctl.py
|
|
|
7438d5 |
@@ -51,8 +51,12 @@ class SysctlPlugin(base.Plugin):
|
|
|
7438d5 |
ret = True
|
|
|
7438d5 |
for option, value in instance._sysctl.iteritems():
|
|
|
7438d5 |
curr_val = self._read_sysctl(option)
|
|
|
7438d5 |
- if self._verify_value(option, self._cmd.remove_ws(self._variables.expand(value)), curr_val) == False:
|
|
|
7438d5 |
- ret = False
|
|
|
7438d5 |
+ if curr_val is None:
|
|
|
7438d5 |
+ log.warn("verify: option '%s' is None, option is probably unavailable/unsupported on your system, skipping it",
|
|
|
7438d5 |
+ str(option))
|
|
|
7438d5 |
+ else:
|
|
|
7438d5 |
+ if self._verify_value(option, self._cmd.remove_ws(self._variables.expand(value)), curr_val) == False:
|
|
|
7438d5 |
+ ret = False
|
|
|
7438d5 |
return ret
|
|
|
7438d5 |
|
|
|
7438d5 |
def _instance_unapply_static(self, instance, profile_switch = False):
|