RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #684 - swap ntpd for systemd-timesyncd 

Fix #682 - swap ntpd for systemd-timesyncd
This commit is contained in:
Anton Hvornum 2021-11-05 16:22:43 +00:00 committed by GitHub
parent 31a7a85e04 37c40b8894
commit 3e53d45413
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
archinstall/lib/installer.py
View File

@ -13,6 +13,7 @@ from .disk.helpers import get_mount_info
from .mirrors import use_mirrors
from .plugins import plugins
from .storage import storage
from .systemd import Boot
# from .user_interaction import *
from .output import log
from .profiles import Profile
@ -256,10 +257,20 @@ class Installer:
)
def activate_ntp(self):
self.log('Installing and activating NTP.', level=logging.INFO)
if self.pacstrap('ntp'):
if self.enable_service('ntpd'):
return True
log(f"activate_ntp() is deprecated, use activate_time_syncronization()", fg="yellow", level=logging.INFO)
self.activate_time_syncronization()
def activate_time_syncronization(self):
self.log('Activating systemd-timesyncd for time synchronization using Arch Linux and ntp.org NTP servers.', level=logging.INFO)
self.enable_service('systemd-timesyncd')
with open(f"{self.target}/etc/systemd/timesyncd.conf", "w") as fh:
fh.write("[Time]\n")
fh.write("NTP=0.arch.pool.ntp.org 1.arch.pool.ntp.org 2.arch.pool.ntp.org 3.arch.pool.ntp.org\n")
fh.write("FallbackNTP=0.pool.ntp.org 1.pool.ntp.org 0.fr.pool.ntp.org\n")
with Boot(self) as session:
session.SysCommand(["timedatectl", "set-ntp", 'true'])
def enable_service(self, *services):
for service in services:

2
examples/guided.py
View File

@ -310,7 +310,7 @@ def perform_installation(mountpoint):
installation.set_timezone(timezone)
if archinstall.arguments.get('ntp', False):
installation.activate_ntp()
installation.activate_time_syncronization()
if (root_pw := archinstall.arguments.get('!root-password', None)) and len(root_pw):
installation.user_set_pw('root', root_pw)