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

comparison sbin/ftjail @ 689:425b1ae264a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ftjail: FIX: call jexec command params after "--"
author Franz Glasner <fzglas.hg@dom66.de>
date Tue, 01 Oct 2024 15:04:47 +0200
parents 5156eaa27ac9
children 8f1583faf9ea
comparison
equal deleted inserted replaced
688:3e96fc952c45 689:425b1ae264a9
1108 # This would result in errors when running etcupdate. 1108 # This would result in errors when running etcupdate.
1109 # 1109 #
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="$(LC_ALL=C.UTF-8 /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