index : archinstall32 | |
Archlinux32 installer | gitolite user |
summaryrefslogtreecommitdiff |
author | Daniel Girtler <blackrabbit256@gmail.com> | 2022-04-29 17:05:50 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-29 09:05:50 +0200 |
commit | fc08aeef4e3f6ea7bd2f744217b8f2dee9b60c82 (patch) | |
tree | 616b1fb7f5f1b4b37f577e384038cbbcc795ec67 /archinstall/lib | |
parent | 9e942d190a9add9d2ea023ffa03848b353aa6608 (diff) |
-rw-r--r-- | archinstall/lib/installer.py | 8 |
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 694d6388..8b77317a 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -129,6 +129,8 @@ class Installer: self.HOOKS = ["base", "udev", "autodetect", "keyboard", "keymap", "modconf", "block", "filesystems", "fsck"] self.KERNEL_PARAMS = [] + self._zram_enabled = False + 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. @@ -713,7 +715,7 @@ class Installer: self.enable_service('systemd-zram-setup@zram0.service') - self.zram_enabled = True + self._zram_enabled = True return True else: @@ -793,7 +795,7 @@ class Installer: # Zswap should be disabled when using zram. # # https://github.com/archlinux/archinstall/issues/881 - if self.zram_enabled: + if self._zram_enabled: options_entry = "zswap.enabled=0 " + options_entry if real_device := self.detect_encryption(root_partition): @@ -1038,7 +1040,7 @@ class Installer: combo = f'{user}:{password}' echo = shlex.join(['echo', combo]) sh = shlex.join(['sh', '-c', echo]) - + result = SysCommand(f"/usr/bin/arch-chroot {self.target} " + sh[:-1] + " | chpasswd'") return result.exit_code == 0 |