Explorar o código

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

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 <[email protected]>
[commit title/description facelift, fixes tag, fixed From:, pkg bump]
Signed-off-by: Petr Štetiar <[email protected]>
Peter Stadler %!s(int64=6) %!d(string=hai) anos
pai
achega
953c27df31
Modificáronse 2 ficheiros con 2 adicións e 2 borrados
  1. 1 1
      package/base-files/Makefile
  2. 1 1
      package/base-files/files/etc/rc.common

+ 1 - 1
package/base-files/Makefile

@@ -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/

+ 1 - 1
package/base-files/files/etc/rc.common

@@ -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")