Revision de7269cd snf-image-helper/tasks/40DeleteSSHKeys.in

b/snf-image-helper/tasks/40DeleteSSHKeys.in
14 14
    log_error "Target dir: \`$SNF_IMAGE_TARGET' is missing."
15 15
fi
16 16

  
17
target="$SNF_IMAGE_TARGET"
18

  
19 17
if [ "$SNF_IMAGE_PROPERTY_OSFAMILY" != "linux" ]; then
20
    cleanup
21
    trap - EXIT
22 18
    exit 0
23 19
fi
24 20

  
......
29 25
DSA_KEY="/etc/ssh/ssh_host_dsa_key"
30 26
ECDSA_KEY="/etc/ssh/ssh_host_ecdsa_key"
31 27

  
28
target="$SNF_IMAGE_TARGET"
32 29

  
33 30
#Remove the default keys
34 31
for pair in "$HOST_KEY@rsa1" "$RSA_KEY@rsa" "$DSA_KEY@dsa" "$ECDSA_KEY@ecdsa"; do
......
48 45
if [ ! -e "$config" ]; then
49 46
    echo "Warning: Config file: \`$config' is missing."
50 47
    echo "Warning: Can't check for non-default keys."
51
    cleanup
52
    trap - EXIT
53 48
    exit 0
54 49
fi
55 50

  
......
93 88
    fi
94 89
done
95 90

  
96
cleanup
97
trap - EXIT
98

  
99 91
exit 0
100 92

  
101 93
# vim: set sta sts=4 shiftwidth=4 sw=4 et ai :

Also available in: Unified diff