Mercurial > hgrepos > FreeBSD > ports > sysutils > local-bsdtools

comparison sbin/ftjail @ 687:5156eaa27ac9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 e4e7a33c8b75
children 425b1ae264a9
comparison
equal deleted inserted replaced
686:bda643a6310e 687:5156eaa27ac9
1110 if [ -n "${_directory}" ]; then 1110 if [ -n "${_directory}" ]; then
1111 _etcupdate_status='' 1111 _etcupdate_status=''
1112 if [ -n "${_running_jailname}" ]; then 1112 if [ -n "${_running_jailname}" ]; then
1113 _etcupdate_status="$(/usr/sbin/jexec -l -U root "${_running_jailname}" /usr/sbin/etcupdate status 2>&1 || true)" 1113 _etcupdate_status="$(/usr/sbin/jexec -l -U root "${_running_jailname}" /usr/sbin/etcupdate status 2>&1 || true)"
1114 elif [ -d "${_directory}" ]; then 1114 elif [ -d "${_directory}" ]; then
1115 _etcupdate_status="$(/usr/sbin/etcupdate status -D "${_directory}" 2>&1 || true)" 1115 _etcupdate_status="$(LC_ALL=C.UTF-8 /usr/sbin/etcupdate status -D "${_directory}" 2>&1 || true)"
1116 fi 1116 fi
1117 [ -n "${_etcupdate_status}" ] && farray_append _errors "Unresolved conflicts from last update. Please run \"etcupdate resolve\" first." 1117 [ -n "${_etcupdate_status}" ] && farray_append _errors "Unresolved conflicts from last update. Please run \"etcupdate resolve\" first."
1118 fi 1118 fi
1119 1119
1120 if farray_istrue _errors; then 1120 if farray_istrue _errors; then
1414 1414
1415 # Update and/or merge configs 1415 # Update and/or merge configs
1416 if [ -n "${_etcupdate_tarball}" ]; then 1416 if [ -n "${_etcupdate_tarball}" ]; then
1417 # Note: Check for readability has been done above 1417 # Note: Check for readability has been done above
1418 echo "Calling etcupdate for DESTDIR=${_directory}" 1418 echo "Calling etcupdate for DESTDIR=${_directory}"
1419 /usr/sbin/etcupdate -D "${_directory}" -t "${_etcupdate_tarball}" 1419 LC_ALL=C.UTF-8 /usr/sbin/etcupdate -D "${_directory}" -t "${_etcupdate_tarball}"
1420 fi 1420 fi
1421 1421
1422 echo "Checking status of etcupdate at DESTDIR=${_directory}" 1422 echo "Checking status of etcupdate at DESTDIR=${_directory}"
1423 /usr/sbin/etcupdate status -D "${_directory}" || true 1423 LC_ALL=C.UTF-8 /usr/sbin/etcupdate status -D "${_directory}" || true
1424 1424
1425 if [ "${_opt_keep}" != "yes" ]; then 1425 if [ "${_opt_keep}" != "yes" ]; then
1426 echo "Cleaning up...""" 1426 echo "Cleaning up..."""
1427 [ -n "${_u_tmpdir}" ] && [ -d "${_u_tmpdir}" ] && rm -rvf "${_u_tmpdir}" 1427 [ -n "${_u_tmpdir}" ] && [ -d "${_u_tmpdir}" ] && rm -rvf "${_u_tmpdir}"
1428 fi 1428 fi