Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #7799 from cshoredaniel/pr-nut-runas-backport

Browse source 
[18.06] nut: Default to run as root but fix alt runas
This commit is contained in:
Hannu Nyman 2019-01-02 18:02:23 +02:00 committed by GitHub
commit 6f84d68c94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/nut/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=nut
PKG_VERSION:=2.7.4
PKG_RELEASE:=8
PKG_RELEASE:=9
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.networkupstools.org/source/2.7/

2
net/nut/files/nut-monitor.init
View file

@ -9,7 +9,7 @@ nut_upsmon_conf() {
echo "# Config file automatically generated from UCI config" > "$UPSMON_C"
config_get runas "$cfg" runas "nut"
config_get runas "$cfg" runas
[ -n "$runas" ] && echo "RUN_AS_USER $runas" >> $UPSMON_C
config_get val "$cfg" minsupplies 1

10
net/nut/files/nut-server.init
View file

@ -44,7 +44,7 @@ upsd_runas() {
[ -n "$RUNAS" ] && return
config_get runas "$cfg" runas "nut"
config_get runas "$cfg" runas
RUNAS="$runas"
}
@ -62,7 +62,7 @@ upsd_config() {
# Note runas support requires you make sure USB device file is readable by
# the runas user
config_get runas "$cfg" runas "nut"
config_get runas "$cfg" runas
RUNAS="$runas"
config_get statepath "$cfg" statepath "/var/run/nut"
@ -221,7 +221,7 @@ build_global_driver_config() {
get_write_driver_config "$cfg" retrydelay
get_write_driver_config "$cfg" pollinterval
get_write_driver_config "$cfg" synchronous
config_get runas "$cfg" user "nut"
config_get runas "$cfg" user
RUNAS="$runas"
upsd_runas
@ -229,7 +229,6 @@ build_global_driver_config() {
}
build_config() {
local RUNAS=nut
local STATEPATH=/var/run/nut
mkdir -m 0755 -p "$(dirname "$UPS_C")"
@ -252,7 +251,7 @@ start_driver_instance() {
local requested="$2"
local driver
local STATEPATH=/var/run/nut
local RUNAS=nut
local RUNAS
[ "$havedriver" != 1 ] && return
@ -301,6 +300,7 @@ start_server_instance() {
start_service() {
local havedriver haveserver
local STATEPATH=/var/run/nut
local RUNAS
# Avoid hotplug inadvertenly restarting driver during
# forced shutdown