adding startupscript for busysbox' syslogd/klogd

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6328 33e552b5-05e3-0310-8538-816dae2090ed

3 files changed, 107 insertions, 24 deletions

diff --git a/rules/rootfs_init_d.inc b/rules/rootfs_init_d.inc
index c2a512ce6..c34b84c64 100644
--- a/rules/rootfs_init_d.inc
+++ b/rules/rootfs_init_d.inc
@@ -105,6 +105,31 @@ ifneq ($(PTXCONF_ROOTFS_ETC_INITD_TELNETD_LINK),"")
 endif
 endif
 
+#
+# syslogd/klogd's script is here, because the busybox entry does not provide it
+# syslogd/klogd from other packets are useing their own startscript
+#
+ifdef PTXCONF_ROOTFS_ETC_INITD_SYSLOGD_KLOGD
+# provide everything for standalone mode
+ifdef PTXCONF_ROOTFS_ETC_INITD_SYSLOGD_KLOGD_DEFAULT
+# use the generic one
+	@$(call install_copy, rootfs, 0, 0, 0755, \
+		$(PTXDIST_TOPDIR)/generic/etc/init.d/syslogd, \
+		/etc/init.d/syslogd, n)
+endif
+ifdef PTXCONF_ROOTFS_ETC_INITD_SYSLOGD_KLOGD_USER
+# user defined one
+	@$(call install_copy, rootfs, 0, 0, 0755, \
+		$(PTXDIST_WORKSPACE)/projectroot/etc/init.d/syslogd, \
+		/etc/init.d/syslogd, n)
+endif
+
+ifneq ($(PTXCONF_ROOTFS_ETC_INITD_SYSLOGD_KLOGD_LINK),"")
+	@$(call install_link, rootfs, ../init.d/syslogd, \
+		/etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_SYSLOGD_KLOGD_LINK))
+endif
+endif
+
 # FIXME: Move this into dropbear's packet!
 ifdef PTXCONF_ROOTFS_ETC_INITD_DROPBEAR
 	@$(call install_copy, rootfs, 0, 0, 0755, \
diff --git a/rules/rootfs_init_d_files.in b/rules/rootfs_init_d_files.in
index 9f81a24c8..7d03ce790 100644
--- a/rules/rootfs_init_d_files.in
+++ b/rules/rootfs_init_d_files.in
@@ -82,7 +82,7 @@ config ROOTFS_ETC_INITD_SYSLOGNG
 	help
 	  The /etc/init.d/syslog-ng script lets you control the syslog-ng daemon.
 
-########################## Telnetd ##########################################
+########################## Telnetd from Busysbox ############################
 
 menuconfig ROOTFS_ETC_INITD_TELNETD
 	depends on ROOTFS_ETC_INITD
@@ -92,8 +92,8 @@ menuconfig ROOTFS_ETC_INITD_TELNETD
 	default y
 	prompt "telnetd                   "
 	help
-	  The /etc/init.d/telnetd script starts up your telnet
-	  demon. Depending on your configuration utelnetd or telnetd
+	  The /etc/init.d/telnetd script starts up your busybox based telnetd
+	  daemon. Depending on your configuration utelnetd or telnetd
 	  is started.
 
 	choice
@@ -103,7 +103,6 @@ menuconfig ROOTFS_ETC_INITD_TELNETD
 		depends on ROOTFS_ETC_INITD_TELNETD
 
 		config ROOTFS_ETC_INITD_TELNETD_DEFAULT
-			depends on ROOTFS_ETC_INITD_TELNETD
 			bool
 			prompt "Use generic"
 			help
@@ -111,12 +110,45 @@ menuconfig ROOTFS_ETC_INITD_TELNETD
 			  See <ptxdist-install>/generic/etc/init.d/telnetd
 
 		config ROOTFS_ETC_INITD_TELNETD_USER
-			depends on ROOTFS_ETC_INITD_TELNETD
 			bool
 			prompt "User defined"
 			help
 			  This uses a user defined telnetd startup script.
-			  PTXdist uses files projectroot/etc/init.d/telnetd in
+			  PTXdist uses file projectroot/etc/init.d/telnetd in
+			  your local project
+	endchoice
+
+######################## syslogd/klogd from Busysbox ##########################
+
+menuconfig ROOTFS_ETC_INITD_SYSLOGD_KLOGD
+	depends on ROOTFS_ETC_INITD
+	depends on BB_CONFIG_SYSLOGD
+	bool
+	prompt "syslogd                   "
+	help
+	  The /etc/init.d/syslogd script starts up your busybox based
+	  syslogd/klogd daemon. Depending on your configuration also klogd will
+	  be started.
+
+	choice
+		prompt "Kind of startup script"
+		default ROOTFS_ETC_INITD_SYSLOGD_KLOGD_DEFAULT
+		depends on ROOTFS_ETC_INITD
+		depends on ROOTFS_ETC_INITD_SYSLOGD_KLOGD
+
+		config ROOTFS_ETC_INITD_SYSLOGD_KLOGD_DEFAULT
+			bool
+			prompt "Use generic"
+			help
+			  Installs a generic /etc/init.d/syslogd startup script.
+			  See <ptxdist-install>/generic/etc/init.d/syslogd
+
+		config ROOTFS_ETC_INITD_SYSLOGD_KLOGD_USER
+			bool
+			prompt "User defined"
+			help
+			  This uses a user defined syslogd startup script.
+			  PTXdist uses file projectroot/etc/init.d/syslogd in
 			  your local project
 	endchoice
 
diff --git a/rules/rootfs_rc_d_links.in b/rules/rootfs_rc_d_links.in
index 35a852455..2e7331a46 100644
--- a/rules/rootfs_rc_d_links.in
+++ b/rules/rootfs_rc_d_links.in
@@ -11,7 +11,8 @@ config ROOTFS_ETC_INITD_UDEV_LINK
 	default "S00_udev"
 	help
 	  Set a link to with this name in /etc/rc.d which points to
-	  /etc/init.d/udev.
+	  /etc/init.d/udev. Keep this entry empty if you do not want to start
+	  this service automatically.
 
 ########################### Modules #########################################
 
@@ -22,7 +23,8 @@ config ROOTFS_ETC_INITD_MODULES_LINK
 	default "S01_modules"
 	help
 	  Set a link to with this name in /etc/rc.d which points to
-	  /etc/init.d/modules.
+	  /etc/init.d/modules. Keep this entry empty if you do not want to start
+	  this service automatically.
 
 ############################ inetd #########################################
 
@@ -33,7 +35,8 @@ config ROOTFS_ETC_INITD_INETD_LINK
 	default "S11_inetd"
 	help
 	  Set a link to with this name in /etc/rc.d which points to
-	  /etc/init.d/inetd.
+	  /etc/init.d/inetd. Keep this entry empty if you do not want to start
+	  this service automatically.
 
 ########################## Networking ########################################
 
@@ -44,7 +47,8 @@ config ROOTFS_ETC_INITD_NETWORKING_LINK
 	default "S02_networking"
 	help
 	  Set a link to with this name in /etc/rc.d which points to
-	  /etc/init.d/networking.
+	  /etc/init.d/networking. Keep this entry empty if you do not want to
+	  start this service automatically.
 
 ########################## Syslog-NG #########################################
 
@@ -55,7 +59,8 @@ config ROOTFS_ETC_INITD_SYSLOGNG_LINK
 	default "S08_syslog-ng"
 	help
 	  Set a link into /etc/rc.d which points to /etc/init.d/syslog-ng to
-	  start the syslog-ng daemon when system boots.
+	  start the syslog-ng daemon when system boots. Keep this entry empty if
+	  you do not want to start this service automatically.
 
 ########################## Telnetd ##########################################
 
@@ -66,7 +71,8 @@ config ROOTFS_ETC_INITD_TELNETD_LINK
 	default "S07_telnetd"
 	help
 	  Set a link to with this name in /etc/rc.d which points to
-	  /etc/init.d/telnetd.
+	  /etc/init.d/telnetd. Keep this entry empty if you do not want to start
+	  this service automatically.
 
 ########################## Banner ##########################################
 
@@ -77,7 +83,8 @@ config ROOTFS_ETC_INITD_BANNER_LINK
 	default "S03_banner"
 	help
 	  Set a link to with this name in /etc/rc.d which points to
-	  /etc/init.d/banner.
+	  /etc/init.d/banner. Keep this entry empty if you do not want to start
+	  this service automatically.
 
 ########################## thin httpd  ##########################################
 
@@ -88,7 +95,8 @@ config ROOTFS_ETC_INITD_THTTPD_LINK
 	default "S10_thttpd"
 	help
 	  Set a link into /etc/rc.d which points to /etc/init.d/thttpd to
-	  start thin http daemon when system starts.
+	  start thin http daemon when system starts. Keep this entry empty if
+	  you do not want to start this service automatically.
 
 ########################## Apache 2 ##########################################
 
@@ -99,7 +107,8 @@ config ROOTFS_ETC_INITD_HTTPD_LINK
 	default "S08_httpd"
 	help
 	  Set a link into /etc/rc.d which points to /etc/init.d/httpd to
-	  start apache when system boots.
+	  start apache when system boots. Keep this entry empty if
+	  you do not want to start this service automatically.
 
 ########################## Dropbear ##########################################
 
@@ -110,7 +119,8 @@ config ROOTFS_ETC_INITD_DROPBEAR_LINK
 	default "S08_dropbear"
 	help
 	  Set a link into /etc/rc.d which points to /etc/init.d/dropbear to
-	  start dropbear when system boots.
+	  start dropbear when system boots. Keep this entry empty if
+	  you do not want to start this service automatically.
 
 ########################## pureftpd  ##########################################
 
@@ -121,7 +131,8 @@ config ROOTFS_ETC_INITD_PUREFTPD_LINK
 	default "S09_pureftpd"
 	help
 	  Set a link into /etc/rc.d which points to /etc/init.d/pure-ftpd to
-	  start pure ftp daemon when system starts.
+	  start pure ftp daemon when system starts. Keep this entry empty if
+	  you do not want to start this service automatically.
 
 ############################## cvs ############################################
 
@@ -132,7 +143,8 @@ config ROOTFS_ETC_INITD_CVS_LINK
 	default "S13_cvs"
 	help
 	  Set a link into /etc/rc.d which points to /etc/init.d/cvs to
-	  start cvs as a standalone service when system starts.
+	  start cvs as a standalone service when system starts. Keep this entry
+	  empty if you do not want to start this service automatically.
 
 ############################ rsync #########################################
 
@@ -143,7 +155,8 @@ config ROOTFS_ETC_INITD_RSYNC_LINK
 	default "S14_rsync"
 	help
 	  Set a link into /etc/rc.d which points to /etc/init.d/rsync to
-	  start rsync as a standalone service when system starts.
+	  start rsync as a standalone service when system starts. Keep this
+	  entry empty if you do not want to start this service automatically.
 
 ############################ dnsmasq #########################################
 
@@ -154,8 +167,8 @@ config ROOTFS_ETC_INITD_DNSMASQ_LINK
 	default "S10_dnsmasq"
 	help
 	  Set a link into /etc/rc.d which points to /etc/init.d/dnsmasq to
-	  start dnsmasq as a standalone service when system starts.
-
+	  start dnsmasq as a standalone service when system starts. Keep this
+	  entry empty if you do not want to start this service automatically.
 
 ############################ portmap #########################################
 
@@ -166,8 +179,8 @@ config ROOTFS_ETC_INITD_PORTMAP_LINK
 	default "S11_portmapd"
 	help
 	  Set a link into /etc/rc.d which points to /etc/init.d/portmapd to
-	  start portmap as a standalone service when system starts.
-
+	  start portmap as a standalone service when system starts. Keep this
+	  entry empty if you do not want to start this service automatically.
 
 ############################## fam ##########################################
 
@@ -178,4 +191,17 @@ config ROOTFS_ETC_INITD_FAM_LINK
 	default "S15_famd"
 	help
 	  Set a link into /etc/rc.d which points to /etc/init.d/famd to
-	  start fam as a standalone service when system starts.
+	  start fam as a standalone service when system starts. Keep this entry
+	  empty if you do not want to start this service automatically.
+
+############################ syslog/klogd ###################################
+
+config ROOTFS_ETC_INITD_SYSLOGD_KLOGD_LINK
+	depends on ROOTFS_ETC_INITD_SYSLOGD_KLOGD
+	string
+	prompt "syslogd link name"
+	default "S16_syslogd"
+	help
+	  Set a link into /etc/rc.d which points to /etc/init.d/syslogd to
+	  start syslogd/klogd when system starts. Keep this entry empty if
+	  you do not want to start this service automatically.