From 56c1bc51a95a8634a757148d03cc9ed4cb0f5832 Mon Sep 17 00:00:00 2001 From: "Daniel F. Dickinson" Date: Tue, 28 Aug 2018 14:55:10 -0400 Subject: [PATCH] nut: Use 'real' procd for nut-cgi Even though nut-cgi doesn't run a daemon, using procd triggers is helpful for updating the generated config file when the UCI config changes. So implement this and 'modernize' nut-cgi initscript Signed-off-by: Daniel F. Dickinson --- net/nut/files/nut-cgi.init | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/net/nut/files/nut-cgi.init b/net/nut/files/nut-cgi.init index 50301ccc9..c77e12afd 100755 --- a/net/nut/files/nut-cgi.init +++ b/net/nut/files/nut-cgi.init @@ -5,6 +5,7 @@ # See /LICENSE for more information. # START=51 +USE_PROCD=1 DEFAULT=/etc/default/nut UPSCGI_C=/var/etc/nut/hosts.conf @@ -42,10 +43,10 @@ nut_upscgi_add() { echo "MONITOR $system \"$displayname\"" >> $UPSCGI_C } -start() { - rm -f $UPSCGI_C - rm -f "$UPSCGI_S" +service_reload() { mkdir -m 0755 -p "$(dirname "$UPSCGI_C")" + rm -f "$UPSCGI_C" + rm -f "$UPSCGI_S" config_load nut_cgi @@ -55,9 +56,16 @@ start() { chmod 640 /var/etc/nut/hosts.conf } -stop() { - rm -f $UPSCGI_C +start_service() { + service_reload +} + +stop_service() { + rm -f "$UPSCGI_C" rm -f "$UPSCGI_S" ln -sf /etc/nut/upsset.conf.disable "$UPSCGI_S" } +service_triggers() { + procd_add_reload_trigger "nut_cgi" +}