diff options
author | Petr Viktorin <pviktori@redhat.com> | 2014-11-18 10:40:31 +0100 |
---|---|---|
committer | Petr Vobornik <pvoborni@redhat.com> | 2014-11-19 15:47:45 +0100 |
commit | a14ce85357419f41f0994625d29d3f1af7a53d4c (patch) | |
tree | a7dd448c7edcfd89f8eeff73ffb1246db5af540c | |
parent | 52b141ca6a257b8f12d9ad2ade812ec1bfebf0d7 (diff) | |
download | freeipa-a14ce85357419f41f0994625d29d3f1af7a53d4c.tar.gz freeipa-a14ce85357419f41f0994625d29d3f1af7a53d4c.tar.xz freeipa-a14ce85357419f41f0994625d29d3f1af7a53d4c.zip |
Do not restore SELinux settings that were not backed up
https://fedorahosted.org/freeipa/ticket/4678
Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
-rw-r--r-- | ipaplatform/base/tasks.py | 3 | ||||
-rw-r--r-- | ipaplatform/redhat/tasks.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ipaplatform/base/tasks.py b/ipaplatform/base/tasks.py index 9b15119c4..ff71c2bd1 100644 --- a/ipaplatform/base/tasks.py +++ b/ipaplatform/base/tasks.py @@ -152,7 +152,8 @@ class BaseTaskNamespace(object): :param required_settings: A dictionary mapping the boolean names to desired_values. - The desired value can be 'on' or 'off'. + The desired value can be 'on' or 'off', + or None to leave the setting unchanged. :param backup_func: A function called for each boolean with two arguments: the name and the previous value diff --git a/ipaplatform/redhat/tasks.py b/ipaplatform/redhat/tasks.py index cb0a27f73..b26604aa7 100644 --- a/ipaplatform/redhat/tasks.py +++ b/ipaplatform/redhat/tasks.py @@ -363,6 +363,8 @@ class RedHatTaskNamespace(BaseTaskNamespace): updated_vars = {} failed_vars = {} for setting, state in required_settings.iteritems(): + if state is None: + continue try: (stdout, stderr, rc) = ipautil.run([paths.GETSEBOOL, setting]) original_state = stdout.split()[2] |