From 2e5e426e406c4b72942020460993e5fb91dcb9b6 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Fri, 25 Sep 2009 17:11:24 +0200 Subject: replace multiple '| logger' in regenerate_ssh_host_keys with a single one This is a speed improvement as previous would make a fork/subshell for each pipe. This will only make a single fork. I've also verified that each line in logger output will still get the 'ec2' prefix $ printf "%s\n%s\n" "hi world" "by world" | logger -s -t ec2 2>/dev/null $ tail -n 2 /var/log/messages Sep 24 19:06:10 ip-10-242-225-190 ec2: hi world Sep 24 19:06:10 ip-10-242-225-190 ec2: by world The other thing to note is that I redirected stderr of the regenerate_ssh_host_keys call to logger, so it will go to the logs also. --- ec2-init | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ec2-init b/ec2-init index abe2cc26..8af8896f 100755 --- a/ec2-init +++ b/ec2-init @@ -48,18 +48,18 @@ run_once_ever() { regenerate_ssh_host_keys() { rm -f /etc/ssh/ssh_host_*_key* - ssh-keygen -f /etc/ssh/ssh_host_rsa_key -t rsa -N '' | logger -s -t "ec2" - ssh-keygen -f /etc/ssh/ssh_host_dsa_key -t dsa -N '' | logger -s -t "ec2" + ssh-keygen -f /etc/ssh/ssh_host_rsa_key -t rsa -N '' + ssh-keygen -f /etc/ssh/ssh_host_dsa_key -t dsa -N '' # This allows user to get host keys securely through console log - echo | logger -s -t "ec2" - echo | logger -s -t "ec2" - echo "#############################################################" | logger -s -t "ec2" - echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" | logger -s -t "ec2" - ssh-keygen -l -f /etc/ssh/ssh_host_rsa_key.pub | logger -s -t "ec2" - ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub | logger -s -t "ec2" - echo "-----END SSH HOST KEY FINGERPRINTS-----" | logger -s -t "ec2" - echo "#############################################################" | logger -s -t "ec2" + echo + echo + echo "#############################################################" + echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" + ssh-keygen -l -f /etc/ssh/ssh_host_rsa_key.pub + ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub + echo "-----END SSH HOST KEY FINGERPRINTS-----" + echo "#############################################################" } case "$1" in @@ -75,7 +75,7 @@ case "$1" in if run_once_per_ami ssh_host_key_regeneration then - regenerate_ssh_host_keys + regenerate_ssh_host_keys 2>&1 | logger -s -t "ec2" fi if run_once_ever ec2-defaults -- cgit v1.2.3