diff options
| author | Peter Stadler <peter.stadler@student.uibk.ac.at> | 2019-11-12 15:54:53 +0100 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2019-11-14 22:53:31 +0100 |
| commit | 953c27df315ded7fae45daba0229ced4309e4baa (patch) | |
| tree | f010d97d7acfcc995d107a0ece5f2fafb5863a25 | |
| parent | fa8345539262f71a5fcc8667374b7e064dc43439 (diff) | |
| download | upstream-953c27df315ded7fae45daba0229ced4309e4baa.tar.gz upstream-953c27df315ded7fae45daba0229ced4309e4baa.tar.bz2 upstream-953c27df315ded7fae45daba0229ced4309e4baa.zip | |
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 <peter.stadler@student.uibk.ac.at>
[commit title/description facelift, fixes tag, fixed From:, pkg bump]
Signed-off-by: Petr Štetiar <ynezz@true.cz>
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rwxr-xr-x | package/base-files/files/etc/rc.common | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index b35d00cf94..0ca4d739f3 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=base-files -PKG_RELEASE:=208 +PKG_RELEASE:=209 PKG_FLAGS:=nonshared PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common index d3fa3be505..dbe26ec3bd 100755 --- a/package/base-files/files/etc/rc.common +++ b/package/base-files/files/etc/rc.common @@ -109,7 +109,7 @@ ${INIT_TRACE:+set -x} EXTRA_HELP="\ running Check if service is running status Service status - " +${EXTRA_HELP}" . $IPKG_INSTROOT/lib/functions/procd.sh basescript=$(readlink "$initscript") |