On Mon, Aug 17, 2020 at 04:46:24PM +0200, Christian Hermann wrote:
> * `$_type` does not exist, resulting in empty variable.
> * address issues reported by shellcheck and shfmt
> * drop command concatenation for key creation, because why would you want
> to miss out on ed25519 keys if the previous keys couldn't be
> generated?
>
> Fixes: 0a4f1ee4ed231 ("openssh/rc-once: deduplicate some data")
>
> Signed-off-by: Christian Hermann <[email protected]>
> ---
> projectroot/etc/rc.once.d/openssh | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/projectroot/etc/rc.once.d/openssh
> b/projectroot/etc/rc.once.d/openssh
> index 66cfa06df..4a8dd26b0 100644
> --- a/projectroot/etc/rc.once.d/openssh
> +++ b/projectroot/etc/rc.once.d/openssh
> @@ -19,7 +19,7 @@ host_keys_required() {
>
> create_key() {
> keytype="$1"
> - prettykeytype="$(echo $_type | tr a-z A-Z)"
> + prettykeytype="$(echo "$keytype" | tr '[:lower:]' '[:upper:]')"
As mentioned in my other mail, I've removed this entirely.
> shift
> hostkeys="$1"
> shift
> @@ -28,8 +28,8 @@ create_key() {
>
> if echo "$hostkeys" | grep -x -F "$file" >/dev/null; then
> echo "Create $prettykeytype key; this may take some time ..."
> - rm -f $file &&
> - ssh-keygen -q -f "$file" -N '' -t "$keytype" "$@" || return
> + rm -f "$file" &&
> + ssh-keygen -q -f "$file" -N '' -t "$keytype" "$@" ||
> return
This is just indention, right? I'd like to keep it as is.
> echo "Created $prettykeytype key."
> fi
> }
> @@ -37,9 +37,9 @@ create_key() {
> create_keys() {
> hostkeys="$(host_keys_required)"
>
> - create_key "dsa" "$hostkeys" &&
> - create_key "ecdsa" "$hostkeys" &&
> - create_key "ed25519" "$hostkeys" &&
> + create_key "dsa" "$hostkeys"
> + create_key "ecdsa" "$hostkeys"
> + create_key "ed25519" "$hostkeys"
No. See my other mail.
Michael
> create_key "rsa" "$hostkeys" -b 4096
> }
>
> --
> 2.28.0
>
>
> _______________________________________________
> ptxdist mailing list
> [email protected]
> To unsubscribe, send a mail with subject "unsubscribe" to
> [email protected]
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
[email protected]
To unsubscribe, send a mail with subject "unsubscribe" to
[email protected]
