[OE-core] [PATCH 1/2] base-files: profile: Do not assume that the 'command' command exists

Peter Kjellerstedt peter.kjellerstedt at axis.com
Mon Sep 18 08:49:37 UTC 2017


> -----Original Message-----
> From: openembedded-core-bounces at lists.openembedded.org
> [mailto:openembedded-core-bounces at lists.openembedded.org] On Behalf Of
> Mike Looijmans
> Sent: den 18 september 2017 10:39
> To: openembedded-core at lists.openembedded.org
> Cc: Mike Looijmans <mike.looijmans at topic.nl>
> Subject: [OE-core] [PATCH 1/2] base-files: profile: Do not assume that
> the 'command' command exists
> 
> The "command" shell command appears to be a bashism, the standard
> busybox shell doesn't implement it.
> 
> This avoids the following error when logging in to a host that does
> not have the 'command' command:
> 
>     -sh: command: not found
> 
> It also simplifies the code and reduces the number of forks.
> 
> Fixes: e77cdb761169e404556487ac650dc562000da406
> Signed-off-by: Mike Looijmans <mike.looijmans at topic.nl>
> ---
>  meta/recipes-core/base-files/base-files/profile | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile
> index ceaf15f..b5b533c 100644
> --- a/meta/recipes-core/base-files/base-files/profile
> +++ b/meta/recipes-core/base-files/base-files/profile
> @@ -22,14 +22,12 @@ if [ -d /etc/profile.d ]; then
>  	unset i
>  fi
> 
> -if command -v resize >/dev/null && command -v tty >/dev/null; then
> -	# Make sure we are on a serial console (i.e. the device used starts with
> -	# /dev/tty[A-z]), otherwise we confuse e.g. the eclipse launcher which
> -	# tries do use ssh
> -	case $(tty) in
> -		/dev/tty[A-z]*) resize >/dev/null;;
> -	esac
> -fi
> +# Make sure we are on a serial console (i.e. the device used starts with
> +# /dev/tty[A-z]), otherwise we confuse e.g. the eclipse launcher which
> +# tries do use ssh
> +case $(tty 2>/dev/null) in
> +	/dev/tty[A-z]*) resize >/dev/null;;
> +esac
> 
>  export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM
> 
> --
> 1.9.1

This is basically the same change as I first sent a patch for in April, and 
last pinged this Friday... The only real difference is that this one misses 
passing error output from resize to /dev/null (which it should do to handle 
the case where tty exists, but resize does not).

//Peter




More information about the Openembedded-core mailing list