diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-02-20 23:13:39 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-02-20 23:13:39 +0000 |
| commit | 2e878658a02ca4651673cad2f41a57f27557d6dc (patch) | |
| tree | fd1c10f972e4e7f79775a2b3c52fe907869e6032 /rules/openssh.make | |
| parent | be1d99320d214120a306d659e3eacac4411b5ad3 (diff) | |
| download | ptxdist-2e878658a02ca4651673cad2f41a57f27557d6dc.tar.gz ptxdist-2e878658a02ca4651673cad2f41a57f27557d6dc.tar.xz | |
* init: introduce infrastructure for multiple init methods
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9802 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/openssh.make')
| -rw-r--r-- | rules/openssh.make | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/rules/openssh.make b/rules/openssh.make index ddbc0f868..161b2cd76 100644 --- a/rules/openssh.make +++ b/rules/openssh.make @@ -140,6 +140,11 @@ ifdef PTXCONF_OPENSSH_SSHD @$(call install_alternative, openssh, 0, 0, 0644, /etc/ssh/sshd_config) @$(call install_copy, openssh, 0, 0, 0755, $(OPENSSH_DIR)/sshd, \ /usr/sbin/sshd) +ifdef PTXCONF_INITMETHOD_BBINIT +ifdef PTXCONF_OPENSSH_SSHD_STARTSCRIPT + @$(call install_alternative, openssh, 0, 0, 0755, /etc/init.d/openssh, n) +endif +endif endif ifdef PTXCONF_OPENSSH_SCP @@ -157,27 +162,6 @@ ifdef PTXCONF_OPENSSH_KEYGEN /usr/bin/ssh-keygen) endif -ifdef PTXCONF_ROOTFS_ETC_INITD_OPENSSH_DEFAULT -# install the generic one - @$(call install_copy, openssh, 0, 0, 0755, \ - $(PTXDIST_TOPDIR)/generic/etc/init.d/openssh, \ - /etc/init.d/openssh, n) -endif - -ifdef PTXCONF_ROOTFS_ETC_INITD_OPENSSH_USER -# install users one - @$(call install_copy, openssh, 0, 0, 0755, \ - $(PTXDIST_WORKSPACE)/projectroot/etc/init.d/openssh, \ - /etc/init.d/openssh, n) -endif -# -# FIXME: Is this packet the right location for the link? -# -ifneq ($(PTXCONF_ROOTFS_ETC_INITD_OPENSSH_LINK),"") - @$(call install_link, openssh, ../init.d/openssh, \ - /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_OPENSSH_LINK)) -endif - @$(call install_finish, openssh) @$(call touch, $@) |