Do not install Btrfs module and binary in mkinitcpio (#3865)
* Do not install Btrfs module and binary in mkinitcpio This is what btrfs hook already does. Signed-off-by: Vasiliy Stelmachenok <ventureo@cachyos.org> * Remove unused properties from FilesystemType They were only needed for Btrfs Signed-off-by: Vasiliy Stelmachenok <ventureo@cachyos.org> --------- Signed-off-by: Vasiliy Stelmachenok <ventureo@cachyos.org>
This commit is contained in:
parent
daab8e6ff6
commit
53e8cb3a8c
|
|
@ -802,10 +802,6 @@ class Installer:
|
||||||
) -> None:
|
) -> None:
|
||||||
if (pkg := fs_type.installation_pkg) is not None:
|
if (pkg := fs_type.installation_pkg) is not None:
|
||||||
self._base_packages.append(pkg)
|
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
|
# https://github.com/archlinux/archinstall/issues/1837
|
||||||
if fs_type.fs_type_mount == 'btrfs':
|
if fs_type.fs_type_mount == 'btrfs':
|
||||||
|
|
|
||||||
|
|
@ -822,22 +822,6 @@ class FilesystemType(Enum):
|
||||||
case _:
|
case _:
|
||||||
return None
|
return 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
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def installation_hooks(self) -> str | None:
|
def installation_hooks(self) -> str | None:
|
||||||
match self:
|
match self:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue