Author: luigi
Date: Fri Sep 6 17:18:43 2013
New Revision: 255314
URL: http://svnweb.freebsd.org/changeset/base/255314
Log:
generate multiple host keys and do that unconditionally
Modified:
head/release/picobsd/build/picobsd
Modified: head/release/picobsd/build/picobsd
==============================================================================
--- head/release/picobsd/build/picobsd Fri Sep 6 17:16:33 2013
(r255313)
+++ head/release/picobsd/build/picobsd Fri Sep 6 17:18:43 2013
(r255314)
@@ -693,17 +693,22 @@ populate_mfs_tree() {
# rm $a # do not remove!
) || fail $? crunch
- if [ -f ${dst}/stand/sshd ] ; then
- log "Setting up host key for sshd:"
- if [ -f ${BUILDDIR}/floppy.tree/etc/ssh_host_key.gz ] ; then
- log "Using existing host key"
+ log "Setting up host key for sshd:"
+ for K in rsa1 rsa dsa ; do
+ if [ $K = rsa1 ] ; then
+ i=ssh_host_key
else
- log "Generating new host key"
- ssh-keygen -t rsa1 -f ${BUILDDIR}/floppy.tree/etc/ssh_host_key \
- -N "" -C "root@picobsd"
- gzip -9 ${BUILDDIR}/floppy.tree/etc/ssh_host_key* || true
+ i=ssh_host_${K}_key
fi
- fi
+ if [ -f ${BUILDDIR}/floppy.tree/etc/$i.gz ] ; then
+ log "Using existing host key $i"
+ else
+ log "Generating new host key $i"
+ ssh-keygen -t $K -f ${BUILDDIR}/floppy.tree/etc/$i \
+ -N "" -C "root@picobsd"
+ gzip -9 ${BUILDDIR}/floppy.tree/etc/${i}* || true
+ fi
+ done
log "Copy generic and site-specific MFS tree..."
for MFS_TREE in ${PICO_TREE}/mfs_tree ${MY_TREE}/mfs_tree ; do
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
