Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2021-11-05 22:00:59 +0100
committerAnton Hvornum <anton@hvornum.se>2021-11-05 22:00:59 +0100
commitf1422d955fc793886c7f7b0f3906f8a2169d8d9e (patch)
treeb54b699607e6b8ba0f6a5047232240563cb2c78e /archinstall/lib
parent007e75b6f16f0a83767f11250ab49e6c2bf4f8ad (diff)
Fixed broken import from master
Diffstat (limited to 'archinstall/lib')
-rw-r--r--archinstall/lib/installer.py4
-rw-r--r--archinstall/lib/systemd.py1
2 files changed, 3 insertions, 2 deletions
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index e0c0aee5..36f2e81f 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -14,7 +14,6 @@ from .disk.helpers import get_mount_info
from .mirrors import use_mirrors
from .plugins import plugins
from .storage import storage
-from .systemd import Boot
# from .user_interaction import *
from .output import log
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("FallbackNTP=0.pool.ntp.org 1.pool.ntp.org 0.fr.pool.ntp.org\n")
+ from .systemd import Boot
with Boot(self) as session:
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.
from .systemd import Boot
+ from .systemd import Boot
with Boot(self) as session:
session.SysCommand(["localectl", "set-keymap", '""'])
@@ -692,6 +693,7 @@ class Installer:
from .systemd import Boot
+ from .systemd import Boot
with Boot(self) as session:
session.SysCommand(["localectl", "set-x11-keymap", '""'])
diff --git a/archinstall/lib/systemd.py b/archinstall/lib/systemd.py
index d297c507..a7e35839 100644
--- a/archinstall/lib/systemd.py
+++ b/archinstall/lib/systemd.py
@@ -1,5 +1,4 @@
import logging
-
from .general import SysCommand, SysCommandWorker, locate_binary
from .installer import Installer
from .output import log