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

Moved set_locale() from configure_base_system as it is its own step in a way.

This commit is contained in:
Anton Hvornum 2020-03-16 16:28:10 +01:00
parent 9aebd49fdb
commit 113c7c23b0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archinstall.py
View File

@ -66,7 +66,6 @@ def log(*msg, origin='UNKNOWN', level=5, **kwargs):
else: else:
log_adapter.debug(' '.join(msg)) log_adapter.debug(' '.join(msg))
## == Profiles Path can be set via --profiles-path=/path ## == Profiles Path can be set via --profiles-path=/path
## This just sets the default path if the parameter is omitted. ## This just sets the default path if the parameter is omitted.
try: try:
@ -1056,8 +1055,8 @@ def configure_base_system(*positionals, **kwargs):
o = b''.join(sys_command('/usr/bin/arch-chroot /mnt hwclock --hctosys --localtime')) 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 echo "{hostname}" > /etc/hostname'.format(**args))
#o = sys_command("arch-chroot /mnt sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen") #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))) 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')) o = b''.join(sys_command('/usr/bin/arch-chroot /mnt chmod 700 /root'))
with open('/mnt/etc/mkinitcpio.conf', 'w') as mkinit: with open('/mnt/etc/mkinitcpio.conf', 'w') as mkinit:
@ -1447,6 +1446,7 @@ if __name__ == '__main__':
if not args['rerun'] or rerun: if not args['rerun'] or rerun:
print('[N] Configuring base system.') print('[N] Configuring base system.')
set_locale('en_US.UTF-8 UTF-8')
configure_base_system() configure_base_system()
## WORKAROUND: https://github.com/systemd/systemd/issues/13603#issuecomment-552246188 ## WORKAROUND: https://github.com/systemd/systemd/issues/13603#issuecomment-552246188
print('[N] Setting up bootloader.') print('[N] Setting up bootloader.')