resolve conflict

This commit is contained in:
josch 2014-06-26 14:09:55 +02:00
commit 7dcf15a5f5

View file

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