Merge pull request BastilleBSD#433 from cedwards/linux-pkg-support

basic PKG support for ubuntu/debian containers
Elektrokongen · Aug 1, 2021 · fdc688b · fdc688b
2 parents cd93e13 + 03c830b
commit fdc688b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/usr/local/share/bastille/pkg.sh b/usr/local/share/bastille/pkg.sh
@@ -47,10 +47,13 @@ fi
 
 for _jail in ${JAILS}; do
     info "[${_jail}]:"
-    if [ -f "/usr/sbin/pkg" ]; then
-        jexec -l "${_jail}" /usr/sbin/pkg "$@"
+    bastille_jail_path=$(jls -j "${_jail}" path)
+    if [ -f "/usr/sbin/mport" ]; then
+        jexec -l -U root "${_jail}" /usr/sbin/mport "$@"
+    elif [ -f "${bastille_jail_path}/usr/bin/apt" ]; then
+        jexec -l "${_jail}" /usr/bin/apt "$@"
     else
-        jexec -l "${_jail}" /usr/sbin/mport "$@"
+        jexec -l -U root "${_jail}" /usr/sbin/pkg "$@"
     fi
     echo
 done