Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall.py
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds+github@gmail.com>2020-03-16 16:28:10 +0100
committerAnton Hvornum <anton.feeds+github@gmail.com>2020-03-16 16:28:10 +0100
commit113c7c23b03b3f05f3d1c1cf5ac643a0122a3855 (patch)
tree12a0b009e7b3f177687c37ed3386ecf702900436 /archinstall.py
parent9aebd49fdbb6c2126e33726ae4ef7e810b19f3ee (diff)
Moved set_locale() from configure_base_system as it is its own step in a way.
Diffstat (limited to 'archinstall.py')
-rw-r--r--archinstall.py4
1 files 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.')