From cd26f835468f34155201445e0b9e668c96e905b7 Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Tue, 29 Mar 2022 20:11:39 +0800
Subject: [PATCH] automount: use ntfs3 for kernel 5.15

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
---
 package/emortal/automount/Makefile            | 37 +++++++++++++++----
 package/emortal/automount/files/mount.ntfs    |  2 +
 .../automount/files/zzz-move-automount        |  4 --
 3 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 package/emortal/automount/files/mount.ntfs
 delete mode 100755 package/emortal/automount/files/zzz-move-automount

diff --git a/package/emortal/automount/Makefile b/package/emortal/automount/Makefile
index 82d96c5926..c2734c5b13 100644
--- a/package/emortal/automount/Makefile
+++ b/package/emortal/automount/Makefile
@@ -14,6 +14,7 @@ PKG_RELEASE:=$(COMMITCOUNT)
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_LINUX_5_4 \
 	CONFIG_LINUX_5_10 \
+	CONFIG_LINUX_5_15 \
 	CONFIG_TARGET_ramips
 
 include $(INCLUDE_DIR)/package.mk
@@ -21,23 +22,43 @@ include $(INCLUDE_DIR)/package.mk
 define Package/automount
   TITLE:=Mount autoconfig hotplug script.
   MAINTAINER:=Lean
-  DEPENDS:=+block-mount +kmod-usb-storage +kmod-usb-storage-extras +!TARGET_ramips:kmod-usb-storage-uas \
-	+kmod-fs-vfat +kmod-fs-ext4 +LINUX_5_4:kmod-fs-exfat0 +!LINUX_5_4:kmod-fs-exfat +ntfs-3g
+  DEPENDS:= \
+    +block-mount \
+    +kmod-usb-storage \
+    +kmod-usb-storage-extras \
+    +!TARGET_ramips:kmod-usb-storage-uas \
+    +kmod-fs-ext4 \
+    +!LINUX_5_4:kmod-fs-exfat \
+    +LINUX_5_4:kmod-fs-exfat0 \
+    +kmod-fs-vfat
+    +!LINUX_5_15:ntfs-3g
+    +LINUX_5_15:ntfs3-mount
   PKGARCH:=all
 endef
 
-define Package/automount/description
-  A usb autoconfig hotplug script.
+define Package/ntfs3-mount
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=Filesystem
+  TITLE:=NTFS mount script for Paragon NTFS3 driver
+  DEPENDS:=+kmod-fs-ntfs3
+  CONFLICTS:=ntfs-3g
+  VARIANT:=ntfs3-mount
+  PKGARCH:=all
 endef
 
 define Build/Compile
-	true
 endef
 
 define Package/automount/install
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/15-automount $(1)/etc/15-automount
-	$(INSTALL_BIN) ./files/zzz-move-automount $(1)/etc/uci-defaults/zzz-move-automount
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/block
+	$(INSTALL_BIN) ./files/15-automount $(1)/etc/hotplug.d/block/
+endef
+
+define Package/ntfs3-mount/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) ./files/mount.ntfs $(1)/sbin
 endef
 
 $(eval $(call BuildPackage,automount))
+$(eval $(call BuildPackage,ntfs3-mount))
diff --git a/package/emortal/automount/files/mount.ntfs b/package/emortal/automount/files/mount.ntfs
new file mode 100644
index 0000000000..68b7a2e68f
--- /dev/null
+++ b/package/emortal/automount/files/mount.ntfs
@@ -0,0 +1,2 @@
+#!/bin/sh
+mount -t ntfs3 -o iocharset=utf8 "$@"
diff --git a/package/emortal/automount/files/zzz-move-automount b/package/emortal/automount/files/zzz-move-automount
deleted file mode 100755
index a399aa2b38..0000000000
--- a/package/emortal/automount/files/zzz-move-automount
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-sleep 15
-mv /etc/15-automount /etc/hotplug.d/block/