From fd4a93c3a9afb567556ede8088469e54ef1e42c7 Mon Sep 17 00:00:00 2001 From: Vasiliy Stelmachenok Date: Sun, 12 Oct 2025 23:37:14 +0300 Subject: [PATCH 1/2] Do not install Btrfs module and binary in mkinitcpio This is what btrfs hook already does. Signed-off-by: Vasiliy Stelmachenok --- archinstall/lib/models/device.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/archinstall/lib/models/device.py b/archinstall/lib/models/device.py index 7dc940392e..cbcd65fcce 100644 --- a/archinstall/lib/models/device.py +++ b/archinstall/lib/models/device.py @@ -825,16 +825,12 @@ def installation_pkg(self) -> str | None: @property def installation_module(self) -> str | None: match self: - case FilesystemType.Btrfs: - return 'btrfs' case _: return None @property def installation_binary(self) -> str | None: match self: - case FilesystemType.Btrfs: - return '/usr/bin/btrfs' case _: return None From 52a17b2cdefe659c64c3eae764065e29d5792521 Mon Sep 17 00:00:00 2001 From: Vasiliy Stelmachenok Date: Mon, 13 Oct 2025 16:28:31 +0300 Subject: [PATCH 2/2] Remove unused properties from FilesystemType They were only needed for Btrfs Signed-off-by: Vasiliy Stelmachenok --- archinstall/lib/installer.py | 4 ---- archinstall/lib/models/device.py | 12 ------------ 2 files changed, 16 deletions(-) diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 758c74ac3c..2744f7fcf0 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -802,10 +802,6 @@ def _prepare_fs_type( ) -> None: if (pkg := fs_type.installation_pkg) is not None: self._base_packages.append(pkg) - if (module := fs_type.installation_module) is not None: - self._modules.append(module) - if (binary := fs_type.installation_binary) is not None: - self._binaries.append(binary) # https://github.com/archlinux/archinstall/issues/1837 if fs_type.fs_type_mount == 'btrfs': diff --git a/archinstall/lib/models/device.py b/archinstall/lib/models/device.py index cbcd65fcce..45cf06402e 100644 --- a/archinstall/lib/models/device.py +++ b/archinstall/lib/models/device.py @@ -822,18 +822,6 @@ def installation_pkg(self) -> str | None: case _: return None - @property - def installation_module(self) -> str | None: - match self: - case _: - return None - - @property - def installation_binary(self) -> str | None: - match self: - case _: - return None - @property def installation_hooks(self) -> str | None: match self: