diff --git a/spec_files/jupiter-hw-support/jupiter-hw-support-btrfs.spec b/spec_files/jupiter-hw-support/jupiter-hw-support-btrfs.spec index 5f5ed867..89bb0d2b 100644 --- a/spec_files/jupiter-hw-support/jupiter-hw-support-btrfs.spec +++ b/spec_files/jupiter-hw-support/jupiter-hw-support-btrfs.spec @@ -22,6 +22,7 @@ Patch7: biosupdate.patch Patch8: gnome.patch Patch9: fstrim.patch Patch10: cursor-path.patch +Patch11: ntfs.patch Requires: python3 Requires: python3-evdev diff --git a/spec_files/jupiter-hw-support/jupiter-sd-mounting-btrfs.spec b/spec_files/jupiter-hw-support/jupiter-sd-mounting-btrfs.spec index 730a071f..5203889d 100644 --- a/spec_files/jupiter-hw-support/jupiter-sd-mounting-btrfs.spec +++ b/spec_files/jupiter-hw-support/jupiter-sd-mounting-btrfs.spec @@ -23,6 +23,7 @@ Patch6: priv-write.patch Patch7: biosupdate.patch Patch8: gnome.patch Patch9: fstrim.patch +Patch10: ntfs.patch Requires: jq diff --git a/spec_files/jupiter-hw-support/ntfs.patch b/spec_files/jupiter-hw-support/ntfs.patch new file mode 100644 index 00000000..fbbd59b5 --- /dev/null +++ b/spec_files/jupiter-hw-support/ntfs.patch @@ -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 #### +