[PATCH v2] ssh: use ssh -n to redirect stdin from /dev/null

[Vivek Goyal]

On Wed, Jan 15, 2014 at 12:46:16PM +0800, WANG Chao wrote:
> When we're parsing kdump.conf, we read it from stdin in a while
> loop statement. If we don't use ssh -n within the loop, all rest of the
> kdump.conf options, which are in stdin, will be eaten by ssh.
> 
> Signed-off-by: WANG Chao <chaowang at redhat.com>

Acked-by: Vivek Goyal <vgoyal at redhat.com>

Vivek

> ---
>  mkdumprd | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/mkdumprd b/mkdumprd
> index 6de1755..bc002bc 100644
> --- a/mkdumprd
> +++ b/mkdumprd
> @@ -134,6 +134,7 @@ is_readonly_mount() {
>  
>  #Function: get_ssh_size
>  #$1=dump target
> +#called from while loop and shouldn't read from stdin, so we're using "ssh -n"
>  get_ssh_size() {
>      local _opt _out _size
>      _opt="-i $SSH_KEY_LOCATION -o BatchMode=yes -o StrictHostKeyChecking=yes"
> @@ -149,11 +150,12 @@ get_ssh_size() {
>  #mkdir if save path does not exist on ssh dump target
>  #$1=ssh dump target
>  #caller should ensure write permission on $DUMP_TARGET:$SAVE_PATH
> +#called from while loop and shouldn't read from stdin, so we're using "ssh -n"
>  mkdir_save_path_ssh()
>  {
>      local _opt _dir
>      _opt="-i $SSH_KEY_LOCATION -o BatchMode=yes -o StrictHostKeyChecking=yes"
> -    ssh -q $_opt $1 mkdir -p $SAVE_PATH 2>&1 > /dev/null
> +    ssh -qn $_opt $1 mkdir -p $SAVE_PATH 2>&1 > /dev/null
>      _ret=$?
>      if [ $_ret -ne 0 ]; then
>          perror_exit "mkdir failed on $DUMP_TARGET:$SAVE_PATH"
> @@ -165,7 +167,7 @@ mkdir_save_path_ssh()
>      if [ $_ret -ne 0 ]; then
>          perror_exit "Could not create temporary directory on $DUMP_TARGET:$SAVE_PATH. Make sure user has write permission on destination"
>      fi
> -    ssh -q $_opt $1 rmdir $_dir
> +    ssh -qn $_opt $1 rmdir $_dir
>  
>      return 0
>  }
> -- 
> 1.8.4.2