From 113c7c23b03b3f05f3d1c1cf5ac643a0122a3855 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Mon, 16 Mar 2020 16:28:10 +0100 Subject: Moved set_locale() from configure_base_system as it is its own step in a way. --- archinstall.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/archinstall.py b/archinstall.py index 7f4ff321..6fec833f 100644 --- a/archinstall.py +++ b/archinstall.py @@ -65,7 +65,6 @@ def log(*msg, origin='UNKNOWN', level=5, **kwargs): log_adapter.info(' '.join(msg)) else: log_adapter.debug(' '.join(msg)) - ## == Profiles Path can be set via --profiles-path=/path ## This just sets the default path if the parameter is omitted. @@ -1056,8 +1055,8 @@ def configure_base_system(*positionals, **kwargs): o = b''.join(sys_command('/usr/bin/arch-chroot /mnt hwclock --hctosys --localtime')) #o = sys_command('arch-chroot /mnt echo "{hostname}" > /etc/hostname'.format(**args)) #o = sys_command("arch-chroot /mnt sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen") + o = b''.join(sys_command("/usr/bin/arch-chroot /mnt sh -c \"echo '{hostname}' > /etc/hostname\"".format(**args))) - set_locale('en_US.UTF-8 UTF-8') o = b''.join(sys_command('/usr/bin/arch-chroot /mnt chmod 700 /root')) with open('/mnt/etc/mkinitcpio.conf', 'w') as mkinit: @@ -1447,6 +1446,7 @@ if __name__ == '__main__': if not args['rerun'] or rerun: print('[N] Configuring base system.') + set_locale('en_US.UTF-8 UTF-8') configure_base_system() ## WORKAROUND: https://github.com/systemd/systemd/issues/13603#issuecomment-552246188 print('[N] Setting up bootloader.') -- cgit v1.2.3-70-g09d2