[openwrt/openwrt] ubox: fix broken deferred start of logfile writer

LEDE Commits lede-commits at lists.infradead.org
Mon Jan 31 07:04:51 PST 2022


dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/b6a2cee4b79f6834a4ac437016a09a77ae8eba14

commit b6a2cee4b79f6834a4ac437016a09a77ae8eba14
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Mon Jan 31 15:00:13 2022 +0000

    ubox: fix broken deferred start of logfile writer
    
    Just use 'start' action which will have the desired effect instead of
    trying to introduce a 'start_file' action which didn't work that way
    because procd jshn magic would have to wrap around it.
    
    Fixes: 88baf6ce2c ("ubox: only start log to file when filesystem has been mounted")
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 package/system/ubox/files/log.init | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/package/system/ubox/files/log.init b/package/system/ubox/files/log.init
index 6587cf6b06..c6fdf44292 100644
--- a/package/system/ubox/files/log.init
+++ b/package/system/ubox/files/log.init
@@ -9,8 +9,6 @@ PIDCOUNT=0
 USE_PROCD=1
 PROG=/sbin/logread
 
-extra_command "start_file" "Start writing to log file"
-
 validate_log_section()
 {
 	uci_load_validate system system "$1" "$2" \
@@ -90,7 +88,7 @@ start_service_remote()
 
 register_mount_trigger()
 {
-	[ -n "${log_file}" ] && procd_add_action_mount_trigger start_file "${log_file}"
+	[ -n "${log_file}" ] && procd_add_action_mount_trigger start "${log_file}"
 }
 
 service_triggers()
@@ -109,12 +107,6 @@ start_service()
 	config_foreach validate_log_section system start_service_remote
 }
 
-start_file()
-{
-	config_load system
-	config_foreach validate_log_section system start_service_file
-}
-
 boot() {
 	_BOOT=1 start
 }



More information about the lede-commits mailing list