diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2012-01-10 15:41:10 -0800 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2012-01-14 21:44:29 +0100 |
| commit | 041b78c89b1fe68f44c45e8b6cc6c9f8ea8f0e4c (patch) | |
| tree | ee84767b51a0d08f6ef7c2556843252c8b50b4ca /scripts/kconfig | |
| parent | 4b5f72145e3ba85e38240dba844ebe1fcbb73713 (diff) | |
merge_config.sh: use signal names compatible with dash and bash
The SIGHUP SIGINT and SIGTERM names caused failures when running
merge_config.sh with the dash shell. Dropping the "SIG" component makes
the script work in both bash and dash.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Acked-by: John Stultz <john.stultz@linaro.org>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/kconfig')
| -rw-r--r-- | scripts/kconfig/merge_config.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 890276bd1e67..b91015df96aa 100644 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -24,7 +24,7 @@ clean_up() { rm -f $TMP_FILE exit } -trap clean_up SIGHUP SIGINT SIGTERM +trap clean_up HUP INT TERM usage() { echo "Usage: $0 [OPTIONS] [CONFIG [...]]" |