nut: remove driverpath configuration

While driverpath is could in theory be configurable, this was not implemented
in the OpenWrt NUT package, and there is not need for it. Therefore remove the
sample configuration for it, and setting that configuration in the upsd.conf file.

See https://github.com/openwrt/packages/pull/29607#discussion_r3463526037

Signed-off-by: Daniel F. Dickinson <redacted>

diff --git a/net/nut/files/nut-server-config.sh.functions b/net/nut/files/nut-server-config.sh.functions
index 1a5d36e92a52c5abc99f2ff57ad92fcaebb29413..36693a55be66dcfc14861a9c14321759de38c641 100644 (file)
--- a/net/nut/files/nut-server-config.sh.functions
+++ b/net/nut/files/nut-server-config.sh.functions
@@ -299,7 +299,6 @@ build_global_driver_config() {
 
        # Global driver config
        get_write_ups_config "$cfg" chroot "" "" "$config_file"
-       get_write_ups_config "$cfg" driverpath "" "" "$config_file"
        get_write_ups_config "$cfg" maxstartdelay "" "" "$config_file"
        get_write_ups_config "$cfg" maxretry "" "" "$config_file"
        get_write_ups_config "$cfg" retrydelay "" "" "$config_file"

diff --git a/net/nut/files/nut_server b/net/nut/files/nut_server
index 3b8e293e60754541980b5c56f9b6e1ebf8be29ec..fa255b0be259e85fe21d2aaed5c6d38a3f8dfe65 100644 (file)
--- a/net/nut/files/nut_server
+++ b/net/nut/files/nut_server
@@ -1,5 +1,4 @@
 #config driver_global 'driver_global'
-#      option driverpath /usr/libexec/nut # compile-time default
 
 # ### NOTE ###
 # For USB UPSes it is necessary to properly configure