nut: Use diff non-privileged user for upsmon

By default use a non-privileged user that is different than
the server or driver (when they are running non-privileged).
This is recommended by upstream.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>

diff --git a/net/nut/Makefile b/net/nut/Makefile
index a07921686c9c8942196f0c42e0d70040b76bede4..d139c9357a5b8fe8b46314606a6c259e68eb1f8c 100644 (file)
--- a/net/nut/Makefile
+++ b/net/nut/Makefile
@@ -145,7 +145,7 @@ define Package/nut-upsmon
   $(call Package/nut/Default)
        TITLE+= (monitor)
        DEPENDS:=nut +nut-common
-       USERID:=nut=113:nut=113
+       USERID:=nutmon=114:nutmon=114
 endef
 
 define Package/nut-upsmon/description

diff --git a/net/nut/files/nut-monitor.init b/net/nut/files/nut-monitor.init
index c406746f5e8fbf49f3c8251a167afe98f705dfba..9505408d9550d114f9ec4be3b3adc8bceaa32e09 100755 (executable)
--- a/net/nut/files/nut-monitor.init
+++ b/net/nut/files/nut-monitor.init
@@ -6,11 +6,13 @@ UPSMON_C=/var/etc/nut/upsmon.conf
 
 nut_upsmon_conf() {
        local cfg="$1"
+       local RUNAS val optval
 
        echo "# Config file automatically generated from UCI config" > $UPSMON_C
 
-       config_get runas "$cfg" runas "nut"
-       [ -n "$runas" ] && echo "RUN_AS_USER $runas" >> $UPSMON_C
+       config_get RUNAS "$cfg" runas "nutmon"
+       [ -n "$RUNAS" ] && echo "RUN_AS_USER $RUNAS" >> "$UPSMON_C"
+       runas=$RUNAS
 
        config_get val "$cfg" minsupplies 1
        echo "MINSUPPLIES $val" >> $UPSMON_C

diff --git a/net/nut/files/nut_monitor b/net/nut/files/nut_monitor
index 7dd55ff130c1566e03848a5e426e403d72593021..7b74bc31fbc2efdc3c54341070c07612fc50d477 100644 (file)
--- a/net/nut/files/nut_monitor
+++ b/net/nut/files/nut_monitor
@@ -1,5 +1,5 @@
 #config upsmon 'upsmon'
-#      option runas run-as-user
+#      option runas nutmon
 #      option minsupplies 1
 #      option shutdowncmd '/usr/sbin/nutshutdown'
 #      option notifycmd /path/to/cmd