Skip to content

Commit 3530e10

Browse files
committed
Remove support for NTFS root file system
1 parent b809c84 commit 3530e10

File tree

5 files changed

+2
-25
lines changed

5 files changed

+2
-25
lines changed

PKGBUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ depends=(
3636
'xfsprogs'
3737
'lvm2'
3838
'f2fs-tools'
39-
'ntfs-3g'
4039
'libfido2'
4140
)
4241
makedepends=(

archinstall/lib/disk/device_handler.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,6 @@ def format(
253253
mkfs_type = 'fat'
254254
# Set FAT size
255255
options.extend(('-F', fs_type.value.removeprefix(mkfs_type)))
256-
case FilesystemType.Ntfs:
257-
# Skip zeroing and bad sector check
258-
options.append('--fast')
259256
case FilesystemType.LinuxSwap:
260257
command = 'mkswap'
261258
case _:

archinstall/lib/installer.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -862,14 +862,9 @@ def _prepare_fs_type(
862862
self._base_packages.append(pkg)
863863

864864
# https://github.com/archlinux/archinstall/issues/1837
865-
if fs_type.fs_type_mount == 'btrfs':
865+
if fs_type == FilesystemType.Btrfs:
866866
self._disable_fstrim = True
867867

868-
# There is not yet an fsck tool for NTFS. If it's being used for the root filesystem, the hook should be removed.
869-
if fs_type.fs_type_mount == 'ntfs3' and mountpoint == self.target:
870-
if 'fsck' in self._hooks:
871-
self._hooks.remove('fsck')
872-
873868
def _prepare_encrypt(self, before: str = 'filesystems') -> None:
874869
if self._disk_encryption.hsm_device:
875870
# Required by mkinitcpio to add support for fido2-device options
@@ -1199,7 +1194,7 @@ def _get_kernel_params(
11991194

12001195
kernel_parameters.append('rw')
12011196

1202-
kernel_parameters.append(f'rootfstype={root.safe_fs_type.fs_type_mount}')
1197+
kernel_parameters.append(f'rootfstype={root.safe_fs_type}')
12031198
kernel_parameters.extend(self._kernel_params)
12041199

12051200
debug(f'kernel parameters: {" ".join(kernel_parameters)}')

archinstall/lib/interactions/disk_conf.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from pathlib import Path
22

3-
from archinstall.lib.args import arch_config_handler
43
from archinstall.lib.disk.device_handler import device_handler
54
from archinstall.lib.disk.partitioning_menu import manual_partitioning
65
from archinstall.lib.menu.helpers import Confirmation, Notify, Selection, Table
@@ -257,9 +256,6 @@ def select_main_filesystem_format() -> FilesystemType:
257256
MenuItem('f2fs', value=FilesystemType.F2fs),
258257
]
259258

260-
if arch_config_handler.args.advanced:
261-
items.append(MenuItem('ntfs', value=FilesystemType.Ntfs))
262-
263259
group = MenuItemGroup(items, sort_items=False)
264260
result = Selection[FilesystemType](
265261
group,

archinstall/lib/models/device.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -799,16 +799,6 @@ class FilesystemType(Enum):
799799
def is_crypto(self) -> bool:
800800
return self == FilesystemType.Crypto_luks
801801

802-
@property
803-
def fs_type_mount(self) -> str:
804-
match self:
805-
case FilesystemType.Ntfs:
806-
return 'ntfs3'
807-
case FilesystemType.Fat32:
808-
return 'vfat'
809-
case _:
810-
return self.value
811-
812802
@property
813803
def parted_value(self) -> str:
814804
return self.value + '(v1)' if self == FilesystemType.LinuxSwap else self.value

0 commit comments

Comments
 (0)