diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-12-22 18:56:09 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-12-22 18:56:09 +0000 |
| commit | bbc6694d985ba31fcbc0ffcd26ce2dc847a5187b (patch) | |
| tree | 9a47b4be3d9dbbc443103584ecadc10c828af243 | |
| parent | 606173432325a828bd55744857cbfd690ad9c4cf (diff) | |
| download | upstream-bbc6694d985ba31fcbc0ffcd26ce2dc847a5187b.tar.gz upstream-bbc6694d985ba31fcbc0ffcd26ce2dc847a5187b.tar.bz2 upstream-bbc6694d985ba31fcbc0ffcd26ce2dc847a5187b.zip | |
base-files: add basic procd integration, let procd start (and restart) ubus instead of having an ubus init script
SVN-Revision: 34866
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rwxr-xr-x | package/base-files/files/etc/rc.common | 31 | ||||
| -rw-r--r-- | package/ubus/Makefile | 3 |
3 files changed, 33 insertions, 3 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index ec69e0cb3c..63350f822a 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -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) diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common index fa2df6cd25..78e2dd4940 100755 --- a/package/base-files/files/etc/rc.common +++ b/package/base-files/files/etc/rc.common @@ -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 "$@" && :' diff --git a/package/ubus/Makefile b/package/ubus/Makefile index 617c76749b..782079d775 100644 --- a/package/ubus/Makefile +++ b/package/ubus/Makefile @@ -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 |