# HG changeset patch # User Franz Glasner # Date 1676736484 -3600 # Node ID c5b1647cedb5b3289b6fcfda3564a148403e9f50 # Parent 423c16c3280fb1246c65c70b343f48183ed61633 Comments diff -r 423c16c3280f -r c5b1647cedb5 sbin/ftjail --- a/sbin/ftjail Mon Dec 19 12:07:33 2022 +0100 +++ b/sbin/ftjail Sat Feb 18 17:08:04 2023 +0100 @@ -4,7 +4,7 @@ #: A very minimal BSD Thin Jail management tool. #: #: :Author: Franz Glasner -#: :Copyright: (c) 2022 Franz Glasner. +#: :Copyright: (c) 2022-2023 Franz Glasner. #: All rights reserved. #: :License: BSD 3-Clause "New" or "Revised" License. #: See LICENSE for details. @@ -1138,7 +1138,7 @@ [ ! -d "${_directory}" ] && mkdir "${_directory}" mount -a -F "${_dir_fn_fstab}" -v - # Update configs + # Update and/or merge configs if [ -n "${_etcupdate_tarball}" ]; then echo "Calling etcupdate for DESTDIR=${_directory}" etcupdate -D "${_directory}" -t "${_etcupdate_tarball}"