base-files: add basic procd integration, let procd start (and restart) ubus instead of having an ubus init script
SVN-Revision: 34866
This commit is contained in:
parent
6061734323
commit
bbc6694d98
3 changed files with 33 additions and 3 deletions
|
@ -28,7 +28,7 @@ endif
|
|||
define Package/base-files
|
||||
SECTION:=base
|
||||
CATEGORY:=Base system
|
||||
DEPENDS:=+netifd +libc
|
||||
DEPENDS:=+netifd +libc +procd
|
||||
TITLE:=Base filesystem for OpenWrt
|
||||
URL:=http://openwrt.org/
|
||||
VERSION:=$(PKG_RELEASE)-$(REVISION)
|
||||
|
|
|
@ -75,10 +75,41 @@ $EXTRA_HELP
|
|||
EOF
|
||||
}
|
||||
|
||||
# for procd
|
||||
start_service() {
|
||||
return 0
|
||||
}
|
||||
|
||||
stop_service() {
|
||||
return 0
|
||||
}
|
||||
|
||||
${INIT_TRACE:+set -x}
|
||||
|
||||
. "$initscript"
|
||||
|
||||
[ -n "$USE_PROCD" ] && {
|
||||
. $IPKG_INSTROOT/lib/functions/procd.sh
|
||||
|
||||
rc_procd() {
|
||||
procd_open_service "$(basename "$initscript")" "$initscript"
|
||||
"$@"
|
||||
procd_close_service
|
||||
}
|
||||
|
||||
start() {
|
||||
rc_procd start_service "$@"
|
||||
}
|
||||
|
||||
stop() {
|
||||
procd_kill "$(basename "$initscript")" "$1"
|
||||
}
|
||||
|
||||
reload() {
|
||||
start
|
||||
}
|
||||
}
|
||||
|
||||
ALL_COMMANDS="start stop reload restart boot shutdown enable disable enabled depends ${EXTRA_COMMANDS}"
|
||||
list_contains ALL_COMMANDS "$action" || action=help
|
||||
[ "$action" = "reload" ] && action='eval reload "$@" || restart "$@" && :'
|
||||
|
|
|
@ -63,8 +63,7 @@ define Package/ubus/install
|
|||
endef
|
||||
|
||||
define Package/ubusd/install
|
||||
$(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d
|
||||
$(INSTALL_BIN) ./files/ubus.init $(1)/etc/init.d/ubus
|
||||
$(INSTALL_DIR) $(1)/sbin
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/ubusd $(1)/sbin/
|
||||
endef
|
||||
|
||||
|
|
Loading…
Reference in a new issue