IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Handle cases where ntpd options are scattered on multiple lines

Browse Source
This commit is contained in:
Simo Sorce 2010-10-20 17:03:10 -04:00
parent 42c78a383d
commit f6a50c49ad
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
ipaserver/install/ntpinstance.py
View File

@ -1,6 +1,7 @@
# Authors: Karl MacMillan <kmacmillan@redhat.com> # Authors: Karl MacMillan <kmacmillan@redhat.com>
# Authors: Simo Sorce <ssorce@redhat.com>
# #
# Copyright (C) 2007 Red Hat # Copyright (C) 2007-2010 Red Hat
# see file 'COPYING' for use and warranty information # see file 'COPYING' for use and warranty information
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
@ -97,37 +98,40 @@ class NTPInstance(service.Service):
fd.close() fd.close()
#read in memory, find OPTIONS, check/change it, then overwrite file #read in memory, find OPTIONS, check/change it, then overwrite file
file_changed = False needopts = [ {'val':'-x', 'need':True},
found_options = False {'val':'-g', 'need':True} ]
ntpdsysc = []
fd = open("/etc/sysconfig/ntpd", "r") fd = open("/etc/sysconfig/ntpd", "r")
for line in fd: lines = fd.readlines()
sline = line.strip()
if sline.find("OPTIONS") == 0:
found_options = True
opts = sline.split("=", 1)
if len(opts) != 2:
optvals=""
else:
optvals = opts[1].strip(' "')
if optvals.find("-x") == -1:
optvals += " -x"
file_changed = True
if optvals.find("-g") == -1:
optvals += " -g"
file_changed = True
if file_changed:
line = 'OPTIONS="'+optvals+'"\n'
ntpdsysc.append(line)
fd.close() fd.close()
if not found_options: for line in lines:
ntpdsysc.insert(0, 'OPTIONS="-x -g"\n') sline = line.strip()
file_changed = True if not sline.startswith('OPTIONS'):
continue
sline = sline.replace('"', '')
for opt in needopts:
if sline.find(opt['val']) != -1:
opt['need'] = False
if file_changed: newopts = []
for opt in needopts:
if opt['need']:
newopts.append(opt['val'])
done = False
if newopts:
fd = open("/etc/sysconfig/ntpd", "w") fd = open("/etc/sysconfig/ntpd", "w")
for line in ntpdsysc: for line in lines:
fd.write(line) if not done:
sline = line.strip()
if not sline.startswith('OPTIONS'):
fd.write(line)
continue
sline = sline.replace('"', '')
(variable, opts) = sline.split('=', 1)
fd.write('OPTIONS="%s %s"\n' % (opts, ' '.join(newopts)))
done = True
else:
fd.write(line)
fd.close() fd.close()
def __stop(self): def __stop(self):