From 908975850dbc0aa3db25c1045f42ec12e23c06df Mon Sep 17 00:00:00 2001 From: Sergey Ponomarev Date: Tue, 28 May 2024 02:50:09 +0300 Subject: [PATCH] dropbear: use config_get_bool enable MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The config_get_bool also works with on/off, yes/no, true/false. Add 'main' section name. This will make it easier to change settings from uci. Add a link to documentation. Signed-off-by: Sergey Ponomarev Link: https://github.com/openwrt/openwrt/pull/15579 Signed-off-by: Hauke Mehrtens (cherry picked from commit 4511fa4b30f73185597990ce563bbf3f96385292) Link: https://github.com/openwrt/openwrt/pull/17097 Signed-off-by: Petr Å tetiar --- package/network/services/dropbear/Makefile | 2 +- package/network/services/dropbear/files/dropbear.config | 4 +++- package/network/services/dropbear/files/dropbear.init | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index e9f3bd693c..1918e7dec6 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dropbear PKG_VERSION:=2024.85 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ diff --git a/package/network/services/dropbear/files/dropbear.config b/package/network/services/dropbear/files/dropbear.config index 2139ba0bbe..7eb5975449 100644 --- a/package/network/services/dropbear/files/dropbear.config +++ b/package/network/services/dropbear/files/dropbear.config @@ -1,4 +1,6 @@ -config dropbear +# See https://openwrt.org/docs/guide-user/base-system/dropbear +config dropbear main + option enable '1' option PasswordAuth 'on' option RootPasswordAuth 'on' option Port '22' diff --git a/package/network/services/dropbear/files/dropbear.init b/package/network/services/dropbear/files/dropbear.init index 708fabd326..395237f9bc 100755 --- a/package/network/services/dropbear/files/dropbear.init +++ b/package/network/services/dropbear/files/dropbear.init @@ -361,7 +361,7 @@ dropbear_instance() load_interfaces() { local enable - config_get enable "$1" enable 1 + config_get_bool enable "$1" enable 1 [ "${enable}" = "1" ] || return 0 local direct_iface iface -- 2.30.2