autossh: add an 'enabled' option within the uci configuration file

In a tool like this one, you really want an option to establish if the service
should start or not by default on boot time, especially when its configuration
file has to be customized by the user.

In the configuration file, the new 'enabled' option is setted to '0' by default
since the configuration provided by default will not be the one finally used.

In the init script, the new 'enabled' option is setted to '1' by default in
order to support the previous configuration file behaviour.

Signed-off-by: Adrià Llaudet <adria.llaudet@gmail.com>

diff --git a/net/autossh/Makefile b/net/autossh/Makefile
index c28ce14cea3f6c8e940578ebf2feea3cfc53c141..fa4543af703c599cb4c4a9368ff86b373784e5ff 100644 (file)
--- a/net/autossh/Makefile
+++ b/net/autossh/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=autossh
 PKG_VERSION:=1.4e
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=http://www.harding.motd.ca/autossh/

diff --git a/net/autossh/files/autossh.config b/net/autossh/files/autossh.config
index 6ec323858e25cb749b434a0e3338eb010cec5721..faee881a9f9f4a356b3fa8581853b3abcd6e8934 100644 (file)
--- a/net/autossh/files/autossh.config
+++ b/net/autossh/files/autossh.config
@@ -3,3 +3,4 @@ config autossh
        option gatetime '0'
        option monitorport      '20000'
        option poll     '600'
+       option enabled  '0'

diff --git a/net/autossh/files/autossh.hotplug b/net/autossh/files/autossh.hotplug
index 4f695f44c1cacd6771bcf19725caebfa892e33ba..0e73cae4c33b9f9e5fd1547085cb23db99ee15f4 100644 (file)
--- a/net/autossh/files/autossh.hotplug
+++ b/net/autossh/files/autossh.hotplug
@@ -10,5 +10,5 @@
        [ "$ACTION" = "ifdown" ] && {
                /etc/init.d/autossh stop
        }
-       
+
 }

diff --git a/net/autossh/files/autossh.init b/net/autossh/files/autossh.init
index f81bf4d87a52474371183f96ffaace64208313ba..e21b3910befd590c83f75922513a5b12f9e55b3c 100644 (file)
--- a/net/autossh/files/autossh.init
+++ b/net/autossh/files/autossh.init
@@ -10,6 +10,9 @@ start_instance() {
        config_get gatetime "$section" 'gatetime'
        config_get monitorport "$section" 'monitorport'
        config_get poll "$section" 'poll'
+       config_get_bool enabled "$section" 'enabled' '1'
+
+       [ "$enabled" = 1 ] || exit 0
 
        export AUTOSSH_GATETIME="${gatetime:-30}"
        export AUTOSSH_POLL="${poll:-600}"