# HG changeset patch # User Franz Glasner # Date 1727787775 -7200 # Node ID 5156eaa27ac936e54b8c9af7835e9833533fbe8e # Parent bda643a6310e157f8a6b4cc5f6463d2a1e194962 ftjail: call "etcupdate" with LC_ALL=C.UTF_8 set diff -r bda643a6310e -r 5156eaa27ac9 sbin/ftjail --- 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..."""