Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pullup the following revision (requested by martin in ticket #105): 

distrib/evbarm/instkernel/sshramdisk/Makefile		1.18
	distrib/evbarm/instkernel/sshramdisk/list		1.2
	distrib/evbarm/instkernel/sshramdisk/sshd_config	1.2
	distrib/evbarm/instkernel/sshramdisk/ssh_host_dsa_key	delete
	distrib/evbarm/instkernel/sshramdisk/ssh_host_rsa_key	1.1

Update to newer sshd (the host key is the same as before, it already
was a rsa key). From Harold Gutch
This commit is contained in:
msaitoh 2019-08-23 04:22:49 +00:00
parent 545e14c774
commit 079c8437ff
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distrib/evbarm/instkernel/sshramdisk/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.17 2018/04/08 15:48:39 mlelstv Exp $
# $NetBSD: Makefile,v 1.17.4.1 2019/08/23 04:22:49 msaitoh Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@ -25,7 +25,7 @@ IMAGEENDIAN= be
.endif
MAKEDEVTARGETS= ramdisk
IMAGEDEPENDS= ${CRUNCHBIN} \
dot.profile master.passwd sshd_config ssh_host_dsa_key \
dot.profile master.passwd sshd_config ssh_host_rsa_key \
${NETBSDSRCDIR}/etc/group \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services

4
distrib/evbarm/instkernel/sshramdisk/list
View File

@ -1,4 +1,4 @@
# $NetBSD: list,v 1.1 2013/03/19 22:16:53 garbled Exp $
# $NetBSD: list,v 1.1.38.1 2019/08/23 04:22:49 msaitoh Exp $
SRCDIRS bin sbin external/bsd/less/bin crypto/external/bsd/openssh/bin/sshd usr.bin usr.sbin
@ -88,4 +88,4 @@ COPY ${DISTRIBDIR}/common/services etc/services
COPY ${CURDIR}/dot.profile .profile
COPY ${CURDIR}/inst.profile inst/.profile
COPY ${CURDIR}/sshd_config etc/ssh/sshd_config
COPY ${CURDIR}/ssh_host_dsa_key etc/ssh/ssh_host_dsa_key 600
COPY ${CURDIR}/ssh_host_rsa_key etc/ssh/ssh_host_rsa_key 600

0
distrib/evbarm/instkernel/sshramdisk/ssh_host_dsa_key → distrib/evbarm/instkernel/sshramdisk/ssh_host_rsa_key
View File

5
distrib/evbarm/instkernel/sshramdisk/sshd_config
View File

@ -1,4 +1,4 @@
# $NetBSD: sshd_config,v 1.1 2013/03/19 22:16:53 garbled Exp $
# $NetBSD: sshd_config,v 1.1.38.1 2019/08/23 04:22:49 msaitoh Exp $
# Special cut-down sshd_config for sshramdisk
# Tim Rightnour <garbled@NetBSD.org>
@ -8,7 +8,7 @@
#ListenAddress 0.0.0.0
#ListenAddress ::
#Protocol 2
#HostKey /etc/ssh/ssh_host_dsa_key
#HostKey /etc/ssh/ssh_host_rsa_key
LoginGraceTime 600
# needed because sysinst is uid 0
PermitRootLogin yes
@ -16,5 +16,4 @@ AuthorizedKeysFile .ssh/authorized_keys
PasswordAuthentication yes
# just in case
PermitEmptyPasswords yes
UsePrivilegeSeparation sandbox
AllowUsers pi sysinst