diff options
| author | Juergen Beisert <j.beisert@pengutronix.de> | 2006-11-06 18:23:00 +0000 |
|---|---|---|
| committer | Juergen Beisert <j.beisert@pengutronix.de> | 2006-11-06 18:23:00 +0000 |
| commit | b0b9d3a38384651c0f4135d18d1cb86d0827254d (patch) | |
| tree | 18f26c74eb709e3fa2ad8694b89f3b57ca45a28d /rules/utelnetd.make | |
| parent | 7c983ba932297bb130c2dd55fa21c9e78ea8404e (diff) | |
| download | ptxdist-b0b9d3a38384651c0f4135d18d1cb86d0827254d.tar.gz ptxdist-b0b9d3a38384651c0f4135d18d1cb86d0827254d.tar.xz | |
* utelnetd
- busybox telnetd conflict solved
- startup script is configured in packet's menu
- link configuration is still in rootfs menu
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6286 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/utelnetd.make')
| -rw-r--r-- | rules/utelnetd.make | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/rules/utelnetd.make b/rules/utelnetd.make index d56f1c94b..7bd474221 100644 --- a/rules/utelnetd.make +++ b/rules/utelnetd.make @@ -100,23 +100,36 @@ $(STATEDIR)/utelnetd.targetinstall: $(utelnetd_targetinstall_deps_default) @$(call install_fixup, utelnetd,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") @$(call install_fixup, utelnetd,DEPENDS,) @$(call install_fixup, utelnetd,DESCRIPTION,missing) -ifdef PTXCONF_ROOTFS_ETC_INITD_TELNETD -ifdef PTXCONF_ROOTFS_ETC_INITD_TELNETD_DEFAULT +# +# Install the startup script on request only +# +ifdef PTXCONF_ROOTFS_ETC_INITD_UTELNETD +ifdef PTXCONF_ROOTFS_ETC_INITD_UTELNETD_DEFAULT +# install the generic one @$(call install_copy, utelnetd, 0, 0, 0755, \ $(PTXDIST_TOPDIR)/generic/etc/init.d/telnetd, \ /etc/init.d/telnetd, n) -else -ifneq ($(PTXCONF_ROOTFS_ETC_INITD_TELNETD_USER_FILE),"") - @$(call install_copy, utelnetd, 0, 0, 0755, $(PTXCONF_ROOTFS_ETC_INITD_TELNETD_USER_FILE), /etc/init.d/telnetd, n) +endif +ifdef PTXCONF_ROOTFS_ETC_INITD_UTELNETD_USER +# install users one + @$(call install_copy, udev, 0, 0, 0755, \ + ${PTXDIST_WORKSPACE}/projectroot/etc/init.d/utelnetd, \ + /etc/init.d/telnetd, n) endif endif + +# +# FIXME: Is this packet the right location for the link? +# ifneq ($(PTXCONF_ROOTFS_ETC_INITD_TELNETD_LINK),"") @$(call install_copy, utelnetd, 0, 0, 0755, /etc/rc.d) - @$(call install_link, utelnetd, ../init.d/telnetd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_TELNETD_LINK)) + @$(call install_link, utelnetd, ../init.d/telnetd, \ + /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_TELNETD_LINK)) endif endif - @$(call install_copy, utelnetd, 0, 0, 0755, $(UTELNETD_DIR)/utelnetd, /sbin/utelnetd) + @$(call install_copy, utelnetd, 0, 0, 0755, $(UTELNETD_DIR)/utelnetd, \ + /sbin/utelnetd) @$(call install_finish, utelnetd) |