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

Fix #1096 (#1099) 

Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>
This commit is contained in:
Daniel Girtler 2022-04-29 17:05:50 +10:00 committed by GitHub
parent 9e942d190a
commit fc08aeef4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archinstall/lib/installer.py
View File

@ -129,6 +129,8 @@ class Installer:
self.HOOKS = ["base", "udev", "autodetect", "keyboard", "keymap", "modconf", "block", "filesystems", "fsck"] self.HOOKS = ["base", "udev", "autodetect", "keyboard", "keymap", "modconf", "block", "filesystems", "fsck"]
self.KERNEL_PARAMS = [] self.KERNEL_PARAMS = []
self._zram_enabled = False
def log(self, *args :str, level :int = logging.DEBUG, **kwargs :str): def log(self, *args :str, level :int = logging.DEBUG, **kwargs :str):
""" """
installer.log() wraps output.log() mainly to set a default log-level for this install session. installer.log() wraps output.log() mainly to set a default log-level for this install session.
@ -713,7 +715,7 @@ class Installer:
self.enable_service('systemd-zram-setup@zram0.service') self.enable_service('systemd-zram-setup@zram0.service')
self.zram_enabled = True self._zram_enabled = True
return True return True
else: else:
@ -793,7 +795,7 @@ class Installer:
# Zswap should be disabled when using zram. # Zswap should be disabled when using zram.
# #
# https://github.com/archlinux/archinstall/issues/881 # https://github.com/archlinux/archinstall/issues/881
if self.zram_enabled: if self._zram_enabled:
options_entry = "zswap.enabled=0 " + options_entry options_entry = "zswap.enabled=0 " + options_entry
if real_device := self.detect_encryption(root_partition): if real_device := self.detect_encryption(root_partition):
@ -1038,7 +1040,7 @@ class Installer:
combo = f'{user}:{password}' combo = f'{user}:{password}'
echo = shlex.join(['echo', combo]) echo = shlex.join(['echo', combo])
sh = shlex.join(['sh', '-c', echo]) sh = shlex.join(['sh', '-c', echo])
result = SysCommand(f"/usr/bin/arch-chroot {self.target} " + sh[:-1] + " | chpasswd'") result = SysCommand(f"/usr/bin/arch-chroot {self.target} " + sh[:-1] + " | chpasswd'")
return result.exit_code == 0 return result.exit_code == 0