From: tripolar Date: Tue, 22 Oct 2013 17:26:39 +0000 (+0000) Subject: [packages] openssh-server-pam: simplify install X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=85c6ee97056a9d0da3c66befcf1f795e9d7eaa4d;p=packages.git [packages] openssh-server-pam: simplify install Signed-off-by: Peter Wagner git-svn-id: svn://svn.openwrt.org/openwrt/packages@38497 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/net/openssh/Makefile b/net/openssh/Makefile index cbc6db4c1..d75a85919 100644 --- a/net/openssh/Makefile +++ b/net/openssh/Makefile @@ -205,7 +205,6 @@ define Package/openssh-keygen/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh-keygen $(1)/usr/bin/ endef - define Package/openssh-server/install $(INSTALL_DIR) $(1)/etc/ssh chmod 0700 $(1)/etc/ssh @@ -217,19 +216,13 @@ define Package/openssh-server/install endef define Package/openssh-server-pam/install - $(INSTALL_DIR) $(1)/etc/ssh - chmod 0700 $(1)/etc/ssh - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/ssh/sshd_config $(1)/etc/ssh/ + $(call Package/openssh-server/install,$(1)) sed -i 's,#PasswordAuthentication yes,PasswordAuthentication no,g' $(1)/etc/ssh/sshd_config sed -i 's,#UsePAM no,UsePAM yes,g' $(1)/etc/ssh/sshd_config $(INSTALL_DIR) $(1)/etc/pam.d $(INSTALL_DATA) ./files/sshd.pam $(1)/etc/pam.d/sshd $(INSTALL_DIR) $(1)/etc/security $(INSTALL_DATA) ./files/sshd.pam-access $(1)/etc/security/access-sshd-local.conf - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/sshd.init $(1)/etc/init.d/sshd - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/sshd $(1)/usr/sbin/ endef define Package/openssh-sftp-client/install