Re: [ptxdist] [APPLIED] openssh/rc-once: use fixed string grep to match filename

[Michael Olbrich <mol@pengutronix.de>]

Thanks, applied as 99931412f758783a6d27bd8df3119bb3ce1e0aa6.

Michael

[sent from post-receive hook]

On Mon, 17 Aug 2020 08:18:25 +0200, Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
> This is a (very) minor optimisation. There is no semantical change as
> the fixed list of possible filenames doesn't contain anything that has a
> different meaning when interpreted as a regex, still I consider it
> better style to interpret the filename as a fixed string to match.
> 
> Both busybox and the "big" grep support -F unconditionally so there is
> no problem in using -F.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Message-Id: <20200808083456.26483-2-u.kleine-koenig@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/projectroot/etc/rc.once.d/openssh b/projectroot/etc/rc.once.d/openssh
> index bfec7064181a..66cfa06df12a 100644
> --- a/projectroot/etc/rc.once.d/openssh
> +++ b/projectroot/etc/rc.once.d/openssh
> @@ -26,7 +26,7 @@ create_key() {
>  
>  	file="/etc/ssh/ssh_host_${keytype}_key"
>  
> -	if echo "$hostkeys" | grep -x "$file" >/dev/null; then
> +	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

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de