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