napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[merge] with upstream

Browse Source
This commit is contained in:
Philip Müller 2022-05-19 19:51:15 +07:00
parent 8120d2ae6c
commit c781599c0d
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/fstab/fstab.conf
View File

@ -55,11 +55,7 @@ efiMountOptions: umask=0077
# The standard configuration applies asynchronous discard support and ssd optimizations to btrfs # The standard configuration applies asynchronous discard support and ssd optimizations to btrfs
# and does nothing for other filesystems. # and does nothing for other filesystems.
ssdExtraMountOptions: ssdExtraMountOptions:
<<<<<<< HEAD
btrfs: discard=async,ssd
=======
btrfs: discard=async btrfs: discard=async
>>>>>>> d5a79180e7f8e1fe6ecb986c93c22857ae2888bb
# Additional options added to each line in /etc/crypttab # Additional options added to each line in /etc/crypttab
crypttabOptions: luks crypttabOptions: luks