From 928654ae350b9b79062e4d0bcb18f4b6ccea3b6b Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Tue, 4 Aug 2020 11:34:00 +0200 Subject: Added two new functions. Fixed set_locale. enable_service() was added as well as activate_ntp(). --- archinstall/lib/installer.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'archinstall') diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 3310c335..ea9a605a 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -79,9 +79,9 @@ class Installer(): if not len(locale): return True with open(f'{self.mountpoint}/etc/locale.gen', 'a') as fh: - fh.write(f'{locale} {encoding}\n') + fh.write(f'{locale}.{encoding} {encoding}\n') with open(f'{self.mountpoint}/etc/locale.conf', 'w') as fh: - fh.write(f'LANG={locale}\n') + fh.write(f'LANG={locale}.{encoding}\n') return True if sys_command(f'/usr/bin/arch-chroot {self.mountpoint} locale-gen').exit_code == 0 else False @@ -91,6 +91,15 @@ class Installer(): o = b''.join(sys_command(f'/usr/bin/arch-chroot {self.mountpoint} ln -s /usr/share/zoneinfo/{zone} /etc/localtime')) return True + def activate_ntp(self): + if self.pacstrap('ntp'): + if self.enable_service('ntpd'): + return True + + def enable_service(self, service): + log(f'Enabling service {service}') + return self.arch_chroot(f'systemctl enable {service}').exit_code == 0 + def run_command(self, cmd, *args, **kwargs): return sys_command(f'/usr/bin/arch-chroot {self.mountpoint} {cmd}') -- cgit v1.2.3-54-g00ecf