Skip to content

Add overlays to the jail command #1241

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

Open
oshogbo wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −2
Open

Add overlays to the jail command #1241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion src/man/poudriere-jail.8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
.\"
.\" Note: The date here should be updated whenever a non-trivial
.\" change is made to the manual page.
.Dd April 19, 2024
.Dd August 11, 2025
.Dt POUDRIERE-JAIL 8
.Os
.Sh NAME
Expand All @@ -47,6 +47,7 @@
.Op Fl m Ar method
.Op Fl P Ar patch
.Op Fl p Ar portstree
.Op Fl O Ar overlay Op Fl O Ar overlay2 Ar ...
.Op Fl S Ar srcpath
.Op Fl z Ar set
.Nm
Expand Down Expand Up @@ -336,6 +337,13 @@ to the source tree before building the jail.
.It Fl p Ar portstree
Specify the ports tree to start/stop the jail with.
.Pq Default: Dq Li default
.It Fl O Ar overlay
Specify an extra
.Xr poudriere-ports 8
tree to use as an overlay.
Multiple
.Fl O Ar overlay
arguments may be specified to stack them.
.It Fl q
Remove the header when
.Fl l
Expand Down
9 changes: 8 additions & 1 deletion src/share/poudriere/jail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ Options for -d:

Options for -s and -k:
-p tree -- Specify which ports tree to start/stop the jail with.
-O overlays -- Specify extra ports trees to overlay.
Copy link
Copy Markdown
Member

@michael-o michael-o Aug 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

manpage says overlay, here overlays...

Copy link
Copy Markdown
Author

@oshogbo oshogbo Aug 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have follow the same schema as in case of bulk:

poudriere/src/man/poudriere-bulk.8

Line 306 in 544d112

.It Fl O Ar overlay

poudriere/src/share/poudriere/bulk.sh

Line 66 in 544d112

-O overlays -- Specify extra ports trees to overlay

I guess we can change here and in bulk option to -O overlay

Copy link
Copy Markdown
Member

@michael-o michael-o Aug 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I see. It should be clear that -O can be invoked multiple times.

-z set -- Specify which SET the jail to start/stop with.
EOF
exit ${EX_USAGE}
Expand Down Expand Up @@ -1232,6 +1233,7 @@ REALARCH=${ARCH}
QUIET=0
NAMEONLY=0
PTNAME=default
OVERLAYS=""
SETNAME=""
XDEV=1
BUILD=0
Expand All @@ -1243,7 +1245,7 @@ set_command() {
COMMAND="$1"
}

while getopts "bBiJ:j:v:a:z:m:nf:M:sdkK:lqcip:r:uU:t:z:P:S:DxXC:y" FLAG; do
while getopts "bBiJ:j:v:a:z:m:nf:M:sdkK:lqcip:O:r:uU:t:z:P:S:DxXC:y" FLAG; do
case "${FLAG}" in
b)
BUILD=1
Expand Down Expand Up @@ -1317,6 +1319,11 @@ while getopts "bBiJ:j:v:a:z:m:nf:M:sdkK:lqcip:r:uU:t:z:P:S:DxXC:y" FLAG; do
fi
SRCPATCHFILE="${OPTARG}"
;;
O)
porttree_exists ${OPTARG} ||
err 2 "No such overlay ${OPTARG}"
OVERLAYS="${OVERLAYS} ${OPTARG}"
;;
S)
[ -d ${OPTARG} ] || err 1 "No such directory ${OPTARG}"
SRCPATH=${OPTARG}
Expand Down