Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2021-11-05 23:07:04 +0100
committerGitHub <noreply@github.com>2021-11-05 23:07:04 +0100
commit0fed0b3ce544204ef3ef5ba155825e916f358323 (patch)
treec545eddea5d417166fbc7cd6d6fbe7c4129f5c0b /archinstall
parente29f440c0b9593d4197e1c376abb750f0e5694b5 (diff)
Fixed default zram conf location and imports
Diffstat (limited to 'archinstall')
-rw-r--r--archinstall/lib/installer.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 1d4297a0..b400e741 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -471,7 +471,7 @@ class Installer:
# We could use the default example below, but maybe not the best idea: https://github.com/archlinux/archinstall/pull/678#issuecomment-962124813
# zram_example_location = '/usr/share/doc/zram-generator/zram-generator.conf.example'
# shutil.copy2(f"{self.target}{zram_example_location}", f"{self.target}/usr/lib/systemd/zram-generator.conf")
- with open(f"{self.target}/usr/lib/systemd/zram-generator.conf", "w") as zram_conf:
+ with open(f"{self.target}/etc/systemd/zram-generator.conf", "w") as zram_conf:
zram_conf.write("[zram0]\n")
if self.enable_service('systemd-zram-setup@zram0.service'):
@@ -667,8 +667,6 @@ class Installer:
# In accordance with https://github.com/archlinux/archinstall/issues/107#issuecomment-841701968
# 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,8 +690,6 @@ class Installer:
return False
from .systemd import Boot
-
- from .systemd import Boot
with Boot(self) as session:
session.SysCommand(["localectl", "set-x11-keymap", '""'])