Merge remote branch 'origin/upstream' into tempbranch

client/tests/lmbench/0002-Changing-shebangs-on-lmbench-scripts.patch

+From 7fc9ef8ce9ce630b53b20f1d4207c587df9b9763 Mon Sep 17 00:00:00 2001
+From: Lucas Meneghel Rodrigues <lmr@redhat.com>
+Date: Thu, 8 Apr 2010 09:57:10 -0300
+Subject: [PATCH 2/2] Changing shebangs on lmbench scripts
+
+Some distros such as ubuntu use dash as the default
+shell, and lmbench scripts use constructs incompatible
+with it. So, at least for ubuntu, let's change the
+shebangs from /bin/sh to /bin/bash.
+
+Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
+---
+ scripts/build          |    2 +-
+ scripts/compiler       |    2 +-
+ scripts/config         |    2 +-
+ scripts/config-run     |    2 +-
+ scripts/config-scaling |    2 +-
+ scripts/do_ctx         |    2 +-
+ scripts/info           |    2 +-
+ scripts/lmbench        |    2 +-
+ scripts/make           |    2 +-
+ scripts/mkrelease      |    2 +-
+ scripts/os             |    2 +-
+ scripts/output         |    2 +-
+ scripts/results        |    2 +-
+ scripts/synchronize    |    2 +-
+ scripts/target         |    2 +-
+ scripts/version        |    2 +-
+ scripts/xroff          |    2 +-
+ 17 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/scripts/build b/scripts/build
+index 16a6600..7f0d41e 100755
+--- a/scripts/build
++++ b/scripts/build
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ CC=${CC-`../scripts/compiler`}
+ MAKE=${MAKE-`../scripts/make`}
+diff --git a/scripts/compiler b/scripts/compiler
+index 2fca921..de57298 100755
+--- a/scripts/compiler
++++ b/scripts/compiler
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ if [ "X$CC" != "X" ] && echo "$CC" | grep -q '`'
+ then
+diff --git a/scripts/config b/scripts/config
+index b58cb60..2c0276d 100755
+--- a/scripts/config
++++ b/scripts/config
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ UNAME=`uname -n 2>/dev/null`
+ if [ X$UNAME = X ]
+diff --git a/scripts/config-run b/scripts/config-run
+index 9958a31..76ead34 100755
+--- a/scripts/config-run
++++ b/scripts/config-run
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # Configure parameters for lmbench.
+ # %I% %E% %@%
+diff --git a/scripts/config-scaling b/scripts/config-scaling
+index 12e0f02..03f3e38 100755
+--- a/scripts/config-scaling
++++ b/scripts/config-scaling
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # config-scaling - reconfigure just the scaling parameter SYNC_MAX
+ #
+diff --git a/scripts/do_ctx b/scripts/do_ctx
+index 002a6c2..2b1db4c 100755
+--- a/scripts/do_ctx
++++ b/scripts/do_ctx
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # Make sure we can find: ./cmd, df, and netstat
+ PATH=.:$PATH:/etc:/usr/etc:/sbin:/usr/sbin
+diff --git a/scripts/info b/scripts/info
+index e6860ed..18a10b2 100755
+--- a/scripts/info
++++ b/scripts/info
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ UNAME=`uname -n 2>/dev/null`
+ if [ X$UNAME = X ]
+diff --git a/scripts/lmbench b/scripts/lmbench
+index 53ea511..63e5e07 100755
+--- a/scripts/lmbench
++++ b/scripts/lmbench
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # lmbench - run the lmbench benchmark suite.
+ #
+diff --git a/scripts/make b/scripts/make
+index 59bf238..2886ba6 100755
+--- a/scripts/make
++++ b/scripts/make
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ if [ "X$MAKE" != "X" ] && echo "$MAKE" | grep -q '`'
+ then
+diff --git a/scripts/mkrelease b/scripts/mkrelease
+index be50f03..656f9dd 100755
+--- a/scripts/mkrelease
++++ b/scripts/mkrelease
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # %W%
+ #
+diff --git a/scripts/os b/scripts/os
+index ea767c6..c9aed11 100755
+--- a/scripts/os
++++ b/scripts/os
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ if [ "X$OS" != "X" ] && echo "$OS" | grep -q '`'
+ then
+diff --git a/scripts/output b/scripts/output
+index 2a204e3..a27571a 100755
+--- a/scripts/output
++++ b/scripts/output
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ trap "echo /dev/null" 20
+ OUTPUT=/dev/null; export OUTPUT
+ if [ -w /dev/tty ]; then
+diff --git a/scripts/results b/scripts/results
+index cd07c15..5f817d9 100755
+--- a/scripts/results
++++ b/scripts/results
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # $Id$
+ 
+diff --git a/scripts/synchronize b/scripts/synchronize
+index 302db00..eb36d5b 100755
+--- a/scripts/synchronize
++++ b/scripts/synchronize
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # %W% %@% Copyright (c) 1998 Larry McVoy.
+ #
+diff --git a/scripts/target b/scripts/target
+index 77eee07..6998da9 100755
+--- a/scripts/target
++++ b/scripts/target
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # Figure out the OS name if possible.
+ #
+diff --git a/scripts/version b/scripts/version
+index 879b700..9e6bf6c 100755
+--- a/scripts/version
++++ b/scripts/version
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # %W% %@%
+ 
+diff --git a/scripts/xroff b/scripts/xroff
+index d5acf20..02c61d2 100755
+--- a/scripts/xroff
++++ b/scripts/xroff
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # X previewer like groff/nroff scripts.
+ groff -P -filename -P "| groff -Z -X -Tps $*" -X -Tps "$@" 
+-- 
+1.6.6.1
+