diff options
Diffstat (limited to 'process_configs.sh')
| -rwxr-xr-x | process_configs.sh | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/process_configs.sh b/process_configs.sh index 3343bca5c..91e6d1226 100755 --- a/process_configs.sh +++ b/process_configs.sh @@ -1,4 +1,4 @@ -#!/bin/bash -x +#!/bin/bash # # This script takes the merged config files and processes them through oldconfig # and listnewconfig @@ -92,7 +92,7 @@ checkoptions() then while read -r LINE do - if find ./ -name "$(echo "$LINE" | awk -F "=" ' { print $1 } ' | awk ' { print $2 }')" -print0 | xargs -0 grep ^ | grep -q "process_configs_known_broken"; then + if find "${REDHAT}"/configs -name "$(echo "$LINE" | awk -F "=" ' { print $1 } ' | awk ' { print $2 }')" -print0 | xargs -0 grep ^ | grep -q "process_configs_known_broken"; then # This is a known broken config. # See script help warning. checkoptions_error=false @@ -105,7 +105,6 @@ checkoptions() ! $checkoptions_error && return sed -i "1s/^/Error: Mismatches found in configuration files for ${arch} ${variant}\n/" .mismatches"${count}" - [ "$CONTINUEONERROR" ] || exit 1 else rm -f .mismatches"${count}" fi @@ -260,7 +259,6 @@ function process_config() cat .newoptions"${count}" >> .errors"${count}" rm .newoptions"${count}" RETURNCODE=1 - [ "$CONTINUEONERROR" ] || exit 1 fi rm .newoptions"${count}" @@ -270,7 +268,6 @@ function process_config() echo "Found misconfigured config items in ${arch} ${variant}, please set them to an appropriate value" >> .errors"${count}" cat .warnings"${count}" >> .errors"${count}" rm .warnings"${count}" - [ "$CONTINUEONERROR" ] || exit 1 fi rm .warnings"${count}" @@ -340,7 +337,6 @@ function process_configs() } CHECKOPTIONS="" -CONTINUEONERROR="" NEWOPTIONS="" TESTRUN="" CHECKWARNINGS="" @@ -355,7 +351,6 @@ do case $key in -a) CHECKOPTIONS="x" - CONTINUEONERROR="x" NEWOPTIONS="x" CHECKWARNINGS="x" ;; @@ -365,9 +360,6 @@ do -h) usage ;; - -i) - CONTINUEONERROR="x" - ;; -n) NEWOPTIONS="x" ;; |