From 120fa5a3bfee8bdbdf2441cdd1b5aff0e4513db4 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 27 Jun 2014 18:17:51 +0200
Subject: rework service startup, do not hardcode into postinst scripts

---
 package/busybox/Makefile               | 12 ------------
 package/busybox/files/busybox.postinst | 12 +++++-------
 2 files changed, 5 insertions(+), 19 deletions(-)

(limited to 'package/busybox')

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index fe3d313a5..eabed3ef3 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -47,21 +47,9 @@ do-configure:
 do-build:
 	PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} -C ${WRKBUILD} busybox
 
-BBDEFS:=(
-define BBDEF
-ifeq ($(ADK_RUNTIME_START_BUSYBOX_$(1)),y)
-BBDEFS+=echo BBDEF_$(1)=YES;
-else
-BBDEFS+=echo BBDEF_$(1)=NO;
-endif
-endef
-$(foreach OPTION,CROND WATCHDOG SYSLOGD INETD NTPD,$(eval $(call BBDEF,$(OPTION))))
-
 do-install:
 	PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} -C ${WRKBUILD} install $(MAKE_TRACE)
 	$(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
-	$(INSTALL_DIR) $(IDIR_BUSYBOX)/etc
-	${BBDEFS} :) >$(IDIR_BUSYBOX)/etc/.bb_defaults
 ifeq ($(BUSYBOX_IFUPDOWN),y)
 	$(INSTALL_DIR) $(IDIR_BUSYBOX)/etc/init.d
 	$(INSTALL_BIN) ./files/network $(IDIR_BUSYBOX)/etc/init.d
diff --git a/package/busybox/files/busybox.postinst b/package/busybox/files/busybox.postinst
index 89c2d7b74..75996525a 100644
--- a/package/busybox/files/busybox.postinst
+++ b/package/busybox/files/busybox.postinst
@@ -1,13 +1,11 @@
 #!/bin/sh
-if [ -z $IPKG_INSTROOT ];then chmod u+s /bin/busybox;fi
 . $IPKG_INSTROOT/etc/functions.sh
-. $IPKG_INSTROOT/etc/.bb_defaults
 add_rcconf network YES
-add_rcconf crond ${BBDEF_CROND}
-add_rcconf watchdog ${BBDEF_WATCHDOG}
+add_rcconf crond NO
+add_rcconf watchdog NO
 add_rcconf watchdog_flags '-t 10 -T 20'
-add_rcconf syslogd ${BBDEF_SYSLOGD}
+add_rcconf syslogd NO
 add_rcconf syslogd_flags '-C32'
-add_rcconf inetd ${BBDEF_INETD}
-add_rcconf ntpd ${BBDEF_NTPD}
+add_rcconf inetd NO
+add_rcconf ntpd NO
 add_rcconf ntpd_flags '-p time.fu-berlin.de'
-- 
cgit v1.2.3