Imported Debian patch 4.8.10-2
This commit is contained in:
committed by
Mario Fetka
parent
8bc559c5a1
commit
358acdd85f
@@ -28,6 +28,7 @@ from ipapython import ipautil
|
||||
from ipaplatform.tasks import tasks
|
||||
from ipaplatform import services
|
||||
from ipaplatform.paths import paths
|
||||
from ipapython.ipautil import user_input
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -39,6 +40,36 @@ def __backup_config(path, fstore=None):
|
||||
shutil.copy(path, "%s.ipasave" % (path))
|
||||
|
||||
|
||||
def get_time_source():
|
||||
"""
|
||||
While in interactive installation user has to specify NTP server or pool
|
||||
to be used in chrony configuration. This method asks user input on these
|
||||
values in case that they were not specified before installation start.
|
||||
"""
|
||||
ntp_servers = []
|
||||
ntp_pool = ""
|
||||
|
||||
if ipautil.user_input("Do you want to configure chrony "
|
||||
"with NTP server or pool address?", False):
|
||||
servers = user_input("Enter NTP source server addresses separated by "
|
||||
"comma, or press Enter to skip", allow_empty=True)
|
||||
if servers: # if user input is not '' (empty)
|
||||
logger.debug("User provided NTP server(s):")
|
||||
# cut possible multiple servers separated by comma into list
|
||||
for server in servers.split(","):
|
||||
# users tend to separate servers by ", " so strip() whitespaces
|
||||
server = server.strip()
|
||||
ntp_servers.append(server)
|
||||
logger.debug("\t%s", server)
|
||||
|
||||
ntp_pool = user_input("Enter a NTP source pool address, "
|
||||
"or press Enter to skip", allow_empty=True)
|
||||
if ntp_pool: # if user input is not '' (empty)
|
||||
logger.debug("User provided NTP pool:\t%s", ntp_pool)
|
||||
|
||||
return ntp_servers, ntp_pool
|
||||
|
||||
|
||||
def sync_chrony():
|
||||
"""
|
||||
This method enables chronyd service on boot and restarts it to reload
|
||||
|
||||
Reference in New Issue
Block a user