diff sbin/fjail @ 452:d5591ebc303d

Use "--" for jexec and chroot to accept more unconvenient jail names and/or directories
author Franz Glasner <fzglas.hg@dom66.de>
date Fri, 10 May 2024 13:42:10 +0200
parents f6f64fd6f17b
children c615279bb797
line wrap: on
line diff
--- a/sbin/fjail	Fri May 10 09:16:57 2024 +0200
+++ b/sbin/fjail	Fri May 10 13:42:10 2024 +0200
@@ -129,7 +129,7 @@
     if [ -z "${ref_version}" ]; then
         ref_version=$(/bin/freebsd-version -u) || exit 1
     fi
-    _directory_version=$(chroot "${directory}" /bin/freebsd-version -u) || exit 1
+    _directory_version=$(chroot -- "${directory}" /bin/freebsd-version -u) || exit 1
     if [ "${ref_version%%-*}" = "${_directory_version%%-*}" ]; then
         return 0
     fi
@@ -454,7 +454,7 @@
 
     # Call newaliases within the jail
     echo "Calling \"newaliases\""
-    chroot "${_mp}" /usr/bin/newaliases
+    chroot -- "${_mp}" /usr/bin/newaliases
 
     _pcl="${_mp}/etc/periodic.conf.local"
     if [ ! -f "${_pcl}" ]; then
@@ -490,7 +490,7 @@
         echo "monthly_statistics_report_ports=\"YES\"" >> "${_pcl}"
 
         echo "Creating system logfiles that are marked for automatic creation ..."
-        chroot "${_mp}" /usr/sbin/newsyslog -CN
+        chroot -- "${_mp}" /usr/sbin/newsyslog -CN
 
     else
         echo "WARNING: \"${_pcl}\" exists already -- not changed"