chore: Restore patch for NTFS mounting

Marked as chore because I refuse to endorse this.
This commit is contained in:
Kyle Gospodnetich 2024-07-18 11:25:09 -07:00
parent c4006df70a
commit 8110691306
3 changed files with 31 additions and 0 deletions

View File

@ -22,6 +22,7 @@ Patch7: biosupdate.patch
Patch8: gnome.patch Patch8: gnome.patch
Patch9: fstrim.patch Patch9: fstrim.patch
Patch10: cursor-path.patch Patch10: cursor-path.patch
Patch11: ntfs.patch
Requires: python3 Requires: python3
Requires: python3-evdev Requires: python3-evdev

View File

@ -23,6 +23,7 @@ Patch6: priv-write.patch
Patch7: biosupdate.patch Patch7: biosupdate.patch
Patch8: gnome.patch Patch8: gnome.patch
Patch9: fstrim.patch Patch9: fstrim.patch
Patch10: ntfs.patch
Requires: jq Requires: jq

View File

@ -0,0 +1,29 @@
diff --git a/usr/lib/hwsupport/steamos-automount.sh b/usr/lib/hwsupport/steamos-automount.sh
index 39fb11f..a46d04b 100755
--- a/usr/lib/hwsupport/steamos-automount.sh
+++ b/usr/lib/hwsupport/steamos-automount.sh
@@ -63,6 +63,7 @@ do_mount()
dev_json=$(lsblk -o PATH,LABEL,FSTYPE --json -- "$DEVICE" | jq '.blockdevices[0]')
ID_FS_LABEL=$(jq -r '.label | select(type == "string")' <<< "$dev_json")
ID_FS_TYPE=$(jq -r '.fstype | select(type == "string")' <<< "$dev_json")
+ FSTYPE_PREFIX=""
#### SteamOS Btrfs Begin ####
if [[ -f /etc/default/steamos-btrfs ]]; then
@@ -106,6 +107,7 @@ do_mount()
UDISKS2_ALLOW='uid=$UID,gid=$GID,umask,dmask,fmask,locale,norecover,ignore_case,windows_names,compression,nocompression,big_writes,nls,nohidden,sys_immutable,sparse,showmeta,prealloc'
OPTS="${STEAMOS_BTRFS_SDCARD_NTFS_MOUNT_OPTS:-rw,noatime,lazytime,uid=1000,gid=1000,big_writes,umask=0022,ignore_case,windows_names}"
FSTYPE="lowntfs-3g"
+ FSTYPE_PREFIX="ntfs:"
if [[ ! -f /etc/filesystems ]] || ! grep -q '\b'"${FSTYPE}"'\b' /etc/filesystems; then
echo "${FSTYPE}" >> /etc/filesystems
fi
@@ -118,7 +120,7 @@ do_mount()
if [[ -f "${udisks2_mount_options_conf}" && ! -f "${udisks2_mount_options_conf}.orig" ]]; then
mv -f "${udisks2_mount_options_conf}"{,.orig}
fi
- echo -e "[defaults]\n${FSTYPE}_allow=${UDISKS2_ALLOW},${OPTS}" > "${udisks2_mount_options_conf}"
+ echo -e "[defaults]\n${FSTYPE_PREFIX}${FSTYPE}_allow=${UDISKS2_ALLOW},${OPTS}" > "${udisks2_mount_options_conf}"
trap 'rm -f "${udisks2_mount_options_conf}" ; [[ -f "${udisks2_mount_options_conf}.orig" ]] && mv -f "${udisks2_mount_options_conf}"{.orig,}' EXIT
#### SteamOS Btrfs End ####