diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-07-04 15:12:19 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-07-04 15:12:19 +0000 |
| commit | 46b76b1e707386e12ccc336c0047818da259c647 (patch) | |
| tree | 2b1e2596e375d116e8d2561a5fce6cb0c08dbcac /rules/openssh.make | |
| parent | 45a65805fc34d3387c011b9ce25d283489238242 (diff) | |
| download | ptxdist-46b76b1e707386e12ccc336c0047818da259c647.tar.gz ptxdist-46b76b1e707386e12ccc336c0047818da259c647.tar.xz | |
* openssh.make:
install /etc/init.d/opensshd only once
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8593 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/openssh.make')
| -rw-r--r-- | rules/openssh.make | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/rules/openssh.make b/rules/openssh.make index 5c818d718..ddbc0f868 100644 --- a/rules/openssh.make +++ b/rules/openssh.make @@ -142,10 +142,6 @@ ifdef PTXCONF_OPENSSH_SSHD /usr/sbin/sshd) endif -ifdef PTXCONF_ROOTFS_ETC_INITD_OPENSSH - @$(call install_alternative, openssh, 0, 0, 0755, /etc/init.d/openssh) -endif - ifdef PTXCONF_OPENSSH_SCP @$(call install_copy, openssh, 0, 0, 0755, $(OPENSSH_DIR)/scp, \ /usr/bin/scp) @@ -161,13 +157,13 @@ ifdef PTXCONF_OPENSSH_KEYGEN /usr/bin/ssh-keygen) endif -ifdef PTXCONF_ROOTFS_ETC_INITD_OPENSSH 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, \ @@ -181,7 +177,6 @@ ifneq ($(PTXCONF_ROOTFS_ETC_INITD_OPENSSH_LINK),"") @$(call install_link, openssh, ../init.d/openssh, \ /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_OPENSSH_LINK)) endif -endif @$(call install_finish, openssh) |