Mercurial > hgrepos > FreeBSD > ports > sysutils > local-bsdtools
changeset 687:5156eaa27ac9
ftjail: call "etcupdate" with LC_ALL=C.UTF_8 set
| author | Franz Glasner <fzglas.hg@dom66.de> |
|---|---|
| date | Tue, 01 Oct 2024 15:02:55 +0200 |
| parents | bda643a6310e |
| children | 3e96fc952c45 |
| files | sbin/ftjail |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/sbin/ftjail Tue Oct 01 14:49:40 2024 +0200 +++ b/sbin/ftjail Tue Oct 01 15:02:55 2024 +0200 @@ -1112,7 +1112,7 @@ if [ -n "${_running_jailname}" ]; then _etcupdate_status="$(/usr/sbin/jexec -l -U root "${_running_jailname}" /usr/sbin/etcupdate status 2>&1 || true)" elif [ -d "${_directory}" ]; then - _etcupdate_status="$(/usr/sbin/etcupdate status -D "${_directory}" 2>&1 || true)" + _etcupdate_status="$(LC_ALL=C.UTF-8 /usr/sbin/etcupdate status -D "${_directory}" 2>&1 || true)" fi [ -n "${_etcupdate_status}" ] && farray_append _errors "Unresolved conflicts from last update. Please run \"etcupdate resolve\" first." fi @@ -1416,11 +1416,11 @@ if [ -n "${_etcupdate_tarball}" ]; then # Note: Check for readability has been done above echo "Calling etcupdate for DESTDIR=${_directory}" - /usr/sbin/etcupdate -D "${_directory}" -t "${_etcupdate_tarball}" + LC_ALL=C.UTF-8 /usr/sbin/etcupdate -D "${_directory}" -t "${_etcupdate_tarball}" fi echo "Checking status of etcupdate at DESTDIR=${_directory}" - /usr/sbin/etcupdate status -D "${_directory}" || true + LC_ALL=C.UTF-8 /usr/sbin/etcupdate status -D "${_directory}" || true if [ "${_opt_keep}" != "yes" ]; then echo "Cleaning up..."""