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

Fixed broken import from master

This commit is contained in:
Anton Hvornum 2021-11-05 22:00:59 +01:00
parent 007e75b6f1
commit f1422d955f
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archinstall/lib/installer.py
View File

@ -14,7 +14,6 @@ from .disk.helpers import get_mount_info
from .mirrors import use_mirrors from .mirrors import use_mirrors
from .plugins import plugins from .plugins import plugins
from .storage import storage from .storage import storage
from .systemd import Boot
# from .user_interaction import * # from .user_interaction import *
from .output import log from .output import log
from .profiles import Profile from .profiles import Profile
@ -270,6 +269,7 @@ class Installer:
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("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") fh.write("FallbackNTP=0.pool.ntp.org 1.pool.ntp.org 0.fr.pool.ntp.org\n")
from .systemd import Boot
with Boot(self) as session: with Boot(self) as session:
session.SysCommand(["timedatectl", "set-ntp", 'true']) session.SysCommand(["timedatectl", "set-ntp", 'true'])
@ -668,6 +668,7 @@ class Installer:
# Setting an empty keymap first, allows the subsequent call to set layout for both console and x11. # Setting an empty keymap first, allows the subsequent call to set layout for both console and x11.
from .systemd import Boot from .systemd import Boot
from .systemd import Boot
with Boot(self) as session: with Boot(self) as session:
session.SysCommand(["localectl", "set-keymap", '""']) session.SysCommand(["localectl", "set-keymap", '""'])
@ -692,6 +693,7 @@ class Installer:
from .systemd import Boot from .systemd import Boot
from .systemd import Boot
with Boot(self) as session: with Boot(self) as session:
session.SysCommand(["localectl", "set-x11-keymap", '""']) session.SysCommand(["localectl", "set-x11-keymap", '""'])

1
archinstall/lib/systemd.py
View File

@ -1,5 +1,4 @@
import logging import logging
from .general import SysCommand, SysCommandWorker, locate_binary from .general import SysCommand, SysCommandWorker, locate_binary
from .installer import Installer from .installer import Installer
from .output import log from .output import log