[openwrt/openwrt] mtd-utils: add ubihealthd to nand-utils

LEDE Commits lede-commits at lists.infradead.org
Tue Nov 26 04:23:26 PST 2024


dangole pushed a commit to openwrt/openwrt.git, branch openwrt-24.10:
https://git.openwrt.org/39d6d318a6c3427ef7fc91b14bdbd316837f1446

commit 39d6d318a6c3427ef7fc91b14bdbd316837f1446
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Sat Nov 16 15:29:24 2024 +0000

    mtd-utils: add ubihealthd to nand-utils
    
    Add ubihealthd to the nand-utils package, auto-create UCI config for
    each UBI device and launch the daemon on boot.
    
    The default time interval between scrubbing a random PED is 120 seconds
    which means that a fully used 128 MiB flash chip gets scrubbed in about
    a day and a half. The interval can be adjusted in UCI using the
    'interval' option.
    
    Suggested-by: Rodrigo Balerdi <lanchon at gmail.com>
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
    Link: https://github.com/openwrt/openwrt/pull/16973
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
    (cherry picked from commit 7e287b563aa1043a1af54d5e2b0bd96326371732)
---
 package/utils/mtd-utils/Makefile                  | 12 ++++++++--
 package/utils/mtd-utils/files/ubihealthd.defaults | 18 +++++++++++++++
 package/utils/mtd-utils/files/ubihealthd.init     | 27 +++++++++++++++++++++++
 3 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/package/utils/mtd-utils/Makefile b/package/utils/mtd-utils/Makefile
index 046572e83b..0dc8831251 100644
--- a/package/utils/mtd-utils/Makefile
+++ b/package/utils/mtd-utils/Makefile
@@ -65,12 +65,20 @@ CONFIGURE_ARGS += \
 	--without-lzo \
 	--without-zlib
 
+define Package/ubi-utils/conffiles
+/etc/config/ubihealthd
+endef
+
 define Package/ubi-utils/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/sbin/{ubiattach,ubicrc32,ubiblock,ubidetach,ubiformat,ubimkvol} $(1)/usr/sbin/
+		$(PKG_INSTALL_DIR)/usr/sbin/{ubiattach,ubicrc32,ubiblock,ubidetach,ubiformat,ubihealthd} $(1)/usr/sbin/
 	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/sbin/{ubinfo,ubinize,ubirename,ubirmvol,ubirsvol,ubiupdatevol} $(1)/usr/sbin/
+		$(PKG_INSTALL_DIR)/usr/sbin/{ubimkvol,ubinfo,ubinize,ubirename,ubirmvol,ubirsvol,ubiupdatevol} $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/ubihealthd.init $(1)/etc/init.d/ubihealthd
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DATA) ./files/ubihealthd.defaults $(1)/etc/uci-defaults/ubihealthd
 endef
 
 define Package/nand-utils/install
diff --git a/package/utils/mtd-utils/files/ubihealthd.defaults b/package/utils/mtd-utils/files/ubihealthd.defaults
new file mode 100644
index 0000000000..5222961bd4
--- /dev/null
+++ b/package/utils/mtd-utils/files/ubihealthd.defaults
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+[ -e "/etc/config/ubihealthd" ] && exit 0
+[ ! -e "/sys/class/ubi" ] && exit 0
+
+touch  "/etc/config/ubihealthd"
+
+for ubidev in /sys/class/ubi/*/total_eraseblocks; do
+	ubidev="${ubidev%/*}"
+	ubidev="${ubidev##*/}"
+	uci batch <<EOF
+set ubihealthd.$ubidev=ubi-device
+set ubihealthd.$ubidev.device="/dev/$ubidev"
+set ubihealthd.$ubidev.enable=1
+EOF
+done
+
+uci commit ubihealthd
diff --git a/package/utils/mtd-utils/files/ubihealthd.init b/package/utils/mtd-utils/files/ubihealthd.init
new file mode 100644
index 0000000000..c5ec97b22e
--- /dev/null
+++ b/package/utils/mtd-utils/files/ubihealthd.init
@@ -0,0 +1,27 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+
+USE_PROCD=1
+PROG=/usr/sbin/ubihealthd
+
+ubihealthd_instance() {
+	local cfg="$1"
+	local device interval enable
+
+	config_get_bool enable "$cfg" "enable" 1
+	[ "$enable" = "1" ] || return 0
+
+	config_get device "$cfg" "device"
+	config_get interval "$cfg" "interval"
+
+	procd_open_instance
+	procd_set_param command "$PROG" -f -d "$device"
+	[ -n "$interval" ] && procd_append_param command -i "$interval"
+	procd_close_instance
+}
+
+start_service() {
+	config_load ubihealthd
+	config_foreach ubihealthd_instance ubi-device
+}




More information about the lede-commits mailing list