Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ depends=(
'xfsprogs'
'lvm2'
'f2fs-tools'
'ntfs-3g'
'libfido2'
)
makedepends=(
Expand Down
3 changes: 0 additions & 3 deletions archinstall/lib/disk/device_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,6 @@ def format(
mkfs_type = 'fat'
# Set FAT size
options.extend(('-F', fs_type.value.removeprefix(mkfs_type)))
case FilesystemType.Ntfs:
# Skip zeroing and bad sector check
options.append('--fast')
case FilesystemType.LinuxSwap:
command = 'mkswap'
case _:
Expand Down
9 changes: 2 additions & 7 deletions archinstall/lib/installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -862,14 +862,9 @@ def _prepare_fs_type(
self._base_packages.append(pkg)

# https://github.com/archlinux/archinstall/issues/1837
if fs_type.fs_type_mount == 'btrfs':
if fs_type == FilesystemType.Btrfs:
self._disable_fstrim = True

# There is not yet an fsck tool for NTFS. If it's being used for the root filesystem, the hook should be removed.
if fs_type.fs_type_mount == 'ntfs3' and mountpoint == self.target:
if 'fsck' in self._hooks:
self._hooks.remove('fsck')

def _prepare_encrypt(self, before: str = 'filesystems') -> None:
if self._disk_encryption.hsm_device:
# Required by mkinitcpio to add support for fido2-device options
Expand Down Expand Up @@ -1199,7 +1194,7 @@ def _get_kernel_params(

kernel_parameters.append('rw')

kernel_parameters.append(f'rootfstype={root.safe_fs_type.fs_type_mount}')
kernel_parameters.append(f'rootfstype={root.safe_fs_type.value}')
kernel_parameters.extend(self._kernel_params)

debug(f'kernel parameters: {" ".join(kernel_parameters)}')
Expand Down
4 changes: 0 additions & 4 deletions archinstall/lib/interactions/disk_conf.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from pathlib import Path

from archinstall.lib.args import arch_config_handler
from archinstall.lib.disk.device_handler import device_handler
from archinstall.lib.disk.partitioning_menu import manual_partitioning
from archinstall.lib.menu.helpers import Confirmation, Notify, Selection, Table
Expand Down Expand Up @@ -257,9 +256,6 @@ def select_main_filesystem_format() -> FilesystemType:
MenuItem('f2fs', value=FilesystemType.F2fs),
]

if arch_config_handler.args.advanced:
items.append(MenuItem('ntfs', value=FilesystemType.Ntfs))

group = MenuItemGroup(items, sort_items=False)
result = Selection[FilesystemType](
group,
Expand Down
10 changes: 0 additions & 10 deletions archinstall/lib/models/device.py
Original file line number Diff line number Diff line change
Expand Up @@ -799,16 +799,6 @@ class FilesystemType(Enum):
def is_crypto(self) -> bool:
return self == FilesystemType.Crypto_luks

@property
def fs_type_mount(self) -> str:
match self:
case FilesystemType.Ntfs:
return 'ntfs3'
case FilesystemType.Fat32:
return 'vfat'
case _:
return self.value

@property
def parted_value(self) -> str:
return self.value + '(v1)' if self == FilesystemType.LinuxSwap else self.value
Expand Down