[Emdebian-logs] [polystrap] 03/03: resolve conflict

[Johannes Schauer]

This is an automated email from the git hooks/post-receive script.

josch-guest pushed a commit to branch master
in repository polystrap.

commit 7dcf15a5f5d1875df73a81d18bf1f7f106c62eee
Merge: a8efd2d ba4fcd6
Author: josch <j.schauer at email.de>
Date:   Thu Jun 26 14:09:55 2014 +0200

    resolve conflict

 default/hooks/firstboot | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --cc default/hooks/firstboot
index ca784d1,b97d79f..5328b85
--- a/default/hooks/firstboot
+++ b/default/hooks/firstboot
@@@ -10,14 -10,15 +10,14 @@@ cat > $ROOTDIR/etc/init.d/firstboot << 
  
  update-rc.d -f firstboot remove
  
- for f in rsa dsa ecdsa; do rm -rf /etc/ssh/ssh_host_\${f}_key; done
- echo "generating ssh rsa key..."
- ssh-keygen -q -t rsa -f /etc/ssh/ssh_host_rsa_key -C "" -N ""
- echo "generating ssh dsa key..."
- ssh-keygen -q -t dsa -f /etc/ssh/ssh_host_dsa_key -C "" -N ""
- echo "generating ssh ecdsa key..."
- ssh-keygen -q -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -C "" -N ""
- __END__
+ # generating ssh host key to be unique
 -for f in rsa dsa ecdsa; do rm -rf /etc/ssh/ssh_host_\${f}_key; done
 -echo "generating ssh rsa key..."
 -ssh-keygen -q -t rsa -f /etc/ssh/ssh_host_rsa_key -C "" -N ""
 -echo "generating ssh dsa key..."
 -ssh-keygen -q -t dsa -f /etc/ssh/ssh_host_dsa_key -C "" -N ""
 -echo "generating ssh ecdsa key..."
 -ssh-keygen -q -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -C "" -N ""
 -__END__
++#for f in rsa dsa ecdsa; do rm -rf /etc/ssh/ssh_host_\${f}_key; done
++#echo "generating ssh rsa key..."
++#ssh-keygen -q -t rsa -f /etc/ssh/ssh_host_rsa_key -C "" -N ""
++#echo "generating ssh dsa key..."
++#ssh-keygen -q -t dsa -f /etc/ssh/ssh_host_dsa_key -C "" -N ""
++#echo "generating ssh ecdsa key..."
++#ssh-keygen -q -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -C "" -N ""
  
  chmod +x $ROOTDIR/etc/init.d/firstboot
  fakechroot chroot $ROOTDIR update-rc.d firstboot start 99 S

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/emdebian/polystrap.git