Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

A hook for mounting an extra-patches directory into the jail #928

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

A hook for mounting an extra-patches directory into the jail #928

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f4b2972
A hook for mounting an extra-patches directory into the jail
dlangille Oct 15, 2021
f83c52e
Use mkdir -p which removes the need for the test
dlangille Oct 15, 2021
c5a5f0b
Restore check if the directory exists before creating it.
dlangille Oct 16, 2021
e2f2653
Fix va_args error on non-amd64
bdrewery Oct 17, 2021
a78fcf1
enter_interactive: Don't pkg-update.
bdrewery Oct 17, 2021
8d56885
CCACHE_NON_ROOT: Fix access to /root
bdrewery Oct 17, 2021
eedf4ea
Remove surounding if and add -p to the mkdir
dlangille Oct 18, 2021
9a9e7df
Revert "Fix va_args error on non-amd64"
dlangille Oct 18, 2021
7bd0393
Revert "enter_interactive: Don't pkg-update."
dlangille Oct 18, 2021
21a6e08
Revert "CCACHE_NON_ROOT: Fix access to /root"
dlangille Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/etc/poudriere.d/hooks/jail.sh.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,15 @@
status="$1"

# NOTE: mount is invoked before start: re https://github.com/freebsd/poudriere/wiki/hooks
if [ "$status" = "mount" ] && [ -d /usr/local/etc/poudriere.d/local-patches ]; then
if [ "$status" = "mount" ] && [ -d ${POUDRIERED}/local-patches ]; then
mntpath="$2"

# The local-patches directory is created only if it does not already exist.
# If it does not already exist, it means we are doing this on the master jail
if [ ! -d "${mntpath}/local-patches" ]; then
/bin/mkdir "${mntpath}/local-patches"
fi
/bin/mkdir "${mntpath}/local-patches"
dlangille marked this conversation as resolved.
Show resolved Hide resolved

# mount our patches to that location
/sbin/mount -t nullfs -o ro /usr/local/etc/poudriere.d/local-patches "${mntpath}/local-patches"
/sbin/mount -t nullfs -o ro ${POUDRIERED}/local-patches "${mntpath}/local-patches"
fi

exit 0