gwrx/openwrt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

base-files: rc.common: fix missing EXTRA_HELP texts

Browse Source 
Commit ed5b9129d7a4 ("base-files: implement generic service_running")
has added EXTRA_HELP variable, thus overriding already available
EXTRA_HELP text available in other init scripts, resulting in the
missing help text from services like dropbear for example.

So fix this regression by appending EXTRA_HELP text provided by the
other init scripts into the one provided by the script itself.

Fixes: ed5b9129d7a4 ("base-files: implement generic service_running")
Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
[commit title/description facelift, fixes tag, fixed From:, pkg bump]
Signed-off-by: Petr Štetiar <ynezz@true.cz>
This commit is contained in:
Peter Stadler 2019-11-12 15:54:53 +01:00 committed by Petr Štetiar
parent fa83455392
commit 953c27df31
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/Makefile
View File

@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk
include $(INCLUDE_DIR)/feeds.mk include $(INCLUDE_DIR)/feeds.mk
PKG_NAME:=base-files PKG_NAME:=base-files
PKG_RELEASE:=208 PKG_RELEASE:=209
PKG_FLAGS:=nonshared PKG_FLAGS:=nonshared
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/

2
package/base-files/files/etc/rc.common
View File

@ -109,7 +109,7 @@ ${INIT_TRACE:+set -x}
EXTRA_HELP="\ EXTRA_HELP="\
running Check if service is running running Check if service is running
status Service status status Service status
" ${EXTRA_HELP}"
. $IPKG_INSTROOT/lib/functions/procd.sh . $IPKG_INSTROOT/lib/functions/procd.sh
basescript=$(readlink "$initscript") basescript=$(readlink "$initscript")