Remove support for NTFS root file system (#4279)
* Remove support for NTFS root file system * Fix rootfstype value
This commit is contained in:
parent
b809c84ad5
commit
64567a748a
1
PKGBUILD
1
PKGBUILD
|
|
@ -36,7 +36,6 @@ depends=(
|
||||||
'xfsprogs'
|
'xfsprogs'
|
||||||
'lvm2'
|
'lvm2'
|
||||||
'f2fs-tools'
|
'f2fs-tools'
|
||||||
'ntfs-3g'
|
|
||||||
'libfido2'
|
'libfido2'
|
||||||
)
|
)
|
||||||
makedepends=(
|
makedepends=(
|
||||||
|
|
|
||||||
|
|
@ -253,9 +253,6 @@ class DeviceHandler:
|
||||||
mkfs_type = 'fat'
|
mkfs_type = 'fat'
|
||||||
# Set FAT size
|
# Set FAT size
|
||||||
options.extend(('-F', fs_type.value.removeprefix(mkfs_type)))
|
options.extend(('-F', fs_type.value.removeprefix(mkfs_type)))
|
||||||
case FilesystemType.Ntfs:
|
|
||||||
# Skip zeroing and bad sector check
|
|
||||||
options.append('--fast')
|
|
||||||
case FilesystemType.LinuxSwap:
|
case FilesystemType.LinuxSwap:
|
||||||
command = 'mkswap'
|
command = 'mkswap'
|
||||||
case _:
|
case _:
|
||||||
|
|
|
||||||
|
|
@ -862,14 +862,9 @@ class Installer:
|
||||||
self._base_packages.append(pkg)
|
self._base_packages.append(pkg)
|
||||||
|
|
||||||
# https://github.com/archlinux/archinstall/issues/1837
|
# https://github.com/archlinux/archinstall/issues/1837
|
||||||
if fs_type.fs_type_mount == 'btrfs':
|
if fs_type == FilesystemType.Btrfs:
|
||||||
self._disable_fstrim = True
|
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:
|
def _prepare_encrypt(self, before: str = 'filesystems') -> None:
|
||||||
if self._disk_encryption.hsm_device:
|
if self._disk_encryption.hsm_device:
|
||||||
# Required by mkinitcpio to add support for fido2-device options
|
# Required by mkinitcpio to add support for fido2-device options
|
||||||
|
|
@ -1199,7 +1194,7 @@ class Installer:
|
||||||
|
|
||||||
kernel_parameters.append('rw')
|
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)
|
kernel_parameters.extend(self._kernel_params)
|
||||||
|
|
||||||
debug(f'kernel parameters: {" ".join(kernel_parameters)}')
|
debug(f'kernel parameters: {" ".join(kernel_parameters)}')
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
from pathlib import Path
|
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.device_handler import device_handler
|
||||||
from archinstall.lib.disk.partitioning_menu import manual_partitioning
|
from archinstall.lib.disk.partitioning_menu import manual_partitioning
|
||||||
from archinstall.lib.menu.helpers import Confirmation, Notify, Selection, Table
|
from archinstall.lib.menu.helpers import Confirmation, Notify, Selection, Table
|
||||||
|
|
@ -257,9 +256,6 @@ def select_main_filesystem_format() -> FilesystemType:
|
||||||
MenuItem('f2fs', value=FilesystemType.F2fs),
|
MenuItem('f2fs', value=FilesystemType.F2fs),
|
||||||
]
|
]
|
||||||
|
|
||||||
if arch_config_handler.args.advanced:
|
|
||||||
items.append(MenuItem('ntfs', value=FilesystemType.Ntfs))
|
|
||||||
|
|
||||||
group = MenuItemGroup(items, sort_items=False)
|
group = MenuItemGroup(items, sort_items=False)
|
||||||
result = Selection[FilesystemType](
|
result = Selection[FilesystemType](
|
||||||
group,
|
group,
|
||||||
|
|
|
||||||
|
|
@ -799,16 +799,6 @@ class FilesystemType(Enum):
|
||||||
def is_crypto(self) -> bool:
|
def is_crypto(self) -> bool:
|
||||||
return self == FilesystemType.Crypto_luks
|
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
|
@property
|
||||||
def parted_value(self) -> str:
|
def parted_value(self) -> str:
|
||||||
return self.value + '(v1)' if self == FilesystemType.LinuxSwap else self.value
|
return self.value + '(v1)' if self == FilesystemType.LinuxSwap else self.value
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue