From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 22 Nov 2006 23:06:40 +0000 (+0000)
Subject: move busybox init scripts from base-files into the busybox package and make them... 
X-Git-Tag: reboot~30391
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bd8e5fb7db8431d22fad5eb72a2a38c0f1b50f45;p=oweals%2Fopenwrt.git

move busybox init scripts from base-files into the busybox package and make them depend on busybox menuconfig options

SVN-Revision: 5620
---

diff --git a/package/base-files/default/etc/init.d/cron b/package/base-files/default/etc/init.d/cron
deleted file mode 100755
index e78d02332c..0000000000
--- a/package/base-files/default/etc/init.d/cron
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-start () {
-	mkdir -p /var/spool/cron
-	[ -L /var/spool/cron/crontabs ] || ln -s /etc/crontabs /var/spool/cron/crontabs
-	crond -c /etc/crontabs
-}
-
-stop() {
-	killall crond
-}
diff --git a/package/base-files/default/etc/init.d/httpd b/package/base-files/default/etc/init.d/httpd
deleted file mode 100755
index e4f5f48e9c..0000000000
--- a/package/base-files/default/etc/init.d/httpd
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-start() {
-	include /lib/network
-	scan_interfaces
-        config_get ifname wan hostname
-	[ -d /www ] && httpd -p 80 -h /www -r ${hostname:-OpenWrt}
-}
-
-stop() {
-	killall httpd
-}
diff --git a/package/base-files/default/etc/init.d/telnet b/package/base-files/default/etc/init.d/telnet
deleted file mode 100755
index c994c6052f..0000000000
--- a/package/base-files/default/etc/init.d/telnet
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-start() {
-	if awk -F: '/^root:/ && $2 !~ /\!/ {exit 1}' /etc/passwd 2>/dev/null && [ -x /usr/sbin/dropbear ]; then telnetd -l /bin/login; fi
-}
-
-stop() {
-	killall telnetd
-}
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index cc34737264..0c1efc470a 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -21,6 +21,11 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
+init-y :=
+init-$(CONFIG_BUSYBOX_CONFIG_HTTPD) += httpd
+init-$(CONFIG_BUSYBOX_CONFIG_CROND) += cron
+init-$(CONFIG_BUSYBOX_CONFIG_TELNETD) += telnet
+
 define Package/busybox
   SECTION:=base
   CATEGORY:=Base system
@@ -66,6 +71,10 @@ define Package/busybox/install
 		IPKG_ARCH="$(ARCH)" \
 		PREFIX="$(1)" \
 		install
+	mkdir -p $(1)/etc/init.d
+	for tmp in $(init-y); do \
+		$(INSTALL_BIN) ./files/$$$$tmp $(1)/etc/init.d/$$$$tmp; \
+	done
 	-rm -rf $(1)/lib64
 endef
 
diff --git a/package/busybox/files/cron b/package/busybox/files/cron
new file mode 100755
index 0000000000..e78d02332c
--- /dev/null
+++ b/package/busybox/files/cron
@@ -0,0 +1,12 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+
+start () {
+	mkdir -p /var/spool/cron
+	[ -L /var/spool/cron/crontabs ] || ln -s /etc/crontabs /var/spool/cron/crontabs
+	crond -c /etc/crontabs
+}
+
+stop() {
+	killall crond
+}
diff --git a/package/busybox/files/httpd b/package/busybox/files/httpd
new file mode 100755
index 0000000000..e4f5f48e9c
--- /dev/null
+++ b/package/busybox/files/httpd
@@ -0,0 +1,13 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+
+start() {
+	include /lib/network
+	scan_interfaces
+        config_get ifname wan hostname
+	[ -d /www ] && httpd -p 80 -h /www -r ${hostname:-OpenWrt}
+}
+
+stop() {
+	killall httpd
+}
diff --git a/package/busybox/files/telnet b/package/busybox/files/telnet
new file mode 100755
index 0000000000..c994c6052f
--- /dev/null
+++ b/package/busybox/files/telnet
@@ -0,0 +1,10 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+
+start() {
+	if awk -F: '/^root:/ && $2 !~ /\!/ {exit 1}' /etc/passwd 2>/dev/null && [ -x /usr/sbin/dropbear ]; then telnetd -l /bin/login; fi
+}
+
+stop() {
+	killall telnetd
+}