From 2b92d8944517cd8a5bf522831c4a5c6d68cc5696 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Sat, 9 Oct 2021 23:54:02 +0800
Subject: [PATCH] automount: simplified installation

(cherry picked from commit fa6210cba38b26d3b60bcd9a832e274c17114abe)
---
 package/emortal/automount/Makefile                 | 9 ++++-----
 package/emortal/automount/files/zzz-move-automount | 4 ----
 2 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 100755 package/emortal/automount/files/zzz-move-automount

diff --git a/package/emortal/automount/Makefile b/package/emortal/automount/Makefile
index c88c7a7825..b061d161c5 100644
--- a/package/emortal/automount/Makefile
+++ b/package/emortal/automount/Makefile
@@ -18,8 +18,8 @@ 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 +kmod-fs-exfat +ntfs-3g
+  DEPENDS:=+block-mount +kmod-fs-exfat +kmod-fs-ext4 +kmod-fs-vfat +ntfs-3g \
+	+kmod-usb-storage +kmod-usb-storage-extras +!TARGET_ramips:kmod-usb-storage-uas
   PKGARCH:=all
 endef
 
@@ -32,9 +32,8 @@ define Build/Compile
 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
 
 $(eval $(call BuildPackage,automount))
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/