[rhel7-branch][PATCH] Don't enable chronyd if disabled in kickstart (#1002583)

Martin Kolman mkolman at redhat.com
Wed Sep 4 10:54:10 UTC 2013


If the chronyd service is disabled in kickstart, it should not be
automatically enabled.

Signed-off-by: Martin Kolman <mkolman at redhat.com>
---
 pyanaconda/kickstart.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 031a6f1..3993fd3 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -1301,7 +1301,8 @@ class Timezone(commands.timezone.F18_Timezone):
                 ksdata.packages.packageList.append(NTP_PACKAGE)
                 self._added_chrony = True
 
-            if not NTP_SERVICE in ksdata.services.enabled:
+            if not NTP_SERVICE in ksdata.services.enabled and \
+                    not NTP_SERVICE in ksdata.services.disabled:
                 ksdata.services.enabled.append(NTP_SERVICE)
                 self._enabled_chrony = True
 
-- 
1.8.3.1



More information about the anaconda-patches mailing list