diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2022-12-14 17:13:19 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2023-06-21 12:54:37 +0000 |
| commit | 2004a768e44c37a3d0d9602fa66bf139e86da1c4 (patch) | |
| tree | c7bb991c163d2b0708f9dc8b70a35f78a058f9cf | |
| parent | 5018f551ece209a32b06e5225d34fe248d14e479 (diff) | |
| download | src-2004a768e44c37a3d0d9602fa66bf139e86da1c4.tar.gz src-2004a768e44c37a3d0d9602fa66bf139e86da1c4.zip | |
freebsd-update: avoid effects of user's environment on grep
A user had GREP_OPTIONS containing --color=always, which broke grep use
in freebsd-update. Unset this environment variable.
PR: 255990
Reviewed by: kevans
Approved by: re (cperciva, expedited MFC)
Sponsored by: The FreeBSD Foundation
(cherry picked from commit e093c61b2d69e9cca54a2332096c0e36f97bffc0)
(cherry picked from commit 24fe8a518324e291b9ea3fe4e60f2e0fb4f857c5)
| -rw-r--r-- | usr.sbin/freebsd-update/freebsd-update.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 9743cd652d16..cad1b9d617fd 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -3484,6 +3484,9 @@ fi # Set LC_ALL in order to avoid problems with character ranges like [A-Z]. export LC_ALL=C +# Clear environment variables that may affect operation of tools that we use. +unset GREP_OPTIONS + get_params $@ for COMMAND in ${COMMANDS}; do cmd_${COMMAND} |