image -t zsnapshot: Remove stale files from the previous image
With -i, files removed from the world were left behind in the new image.
Fixes: dd61d5134c ("do_clone: Stop overwriting - move that to do_clone_del")
(cherry picked from commit c10dc9a7fc71d6049254c39a5ad71b91886cb1c0)
Conflicts:
src/share/poudriere/image_zsnapshot.sh
jail -u -m src=: Remove stale files from the /usr/src copy
Files removed from the src tree were left behind in the jail's /usr/src.
Issue #1299
Fixes: dd61d5134c ("do_clone: Stop overwriting - move that to do_clone_del")
(cherry picked from commit 0ceb8092c18377bd45e69baa581e2a214b9cae2b)
Conflicts:
src/share/poudriere/jail.sh
image -t zsnapshot: Remove stale files from the previous image
With -i, files removed from the world were left behind in the new image.
Fixes: dd61d5134c ("do_clone: Stop overwriting - move that to do_clone_del")
jail -u -m src=: Remove stale files from the /usr/src copy
Files removed from the src tree were left behind in the jail's /usr/src.
Issue #1299
Fixes: dd61d5134c ("do_clone: Stop overwriting - move that to do_clone_del")
poudriere-jail.8: Now there are pkgbase src packages so remove outdated line
(cherry picked from commit fd8e1fd46b7085268fc3c14dc4c4be6ea8697d0d)
Conflicts:
src/man/poudriere-jail.8
PR #1394
ports, jail: Warn instead of erroring on hyphenated PTNAME/JAILNAME
Downgrade the ports-tree hyphen check from a hard err() to a warning,
consistent with the existing SETNAME hyphen warning. Extract the
hyphen check into a shared check_name_hyphen() helper in common.sh and
apply it uniformly at the point each identifier is established:
jail creation, jail rename, and ports tree creation. SETNAME keeps its
existing call in jail_start(), since a set has no separate creation
step -- its first use in a build is effectively its creation.
The warning intentionally doesn't name a specific mechanism (e.g. the
previous "-z" claim for ports tree names): no code path splits a
hyphenated name back into components during normal creation or build
handling. The only place a joined name is ever decomposed is
for_each_build()'s fallback for build logs predating separate
jailname/ptname/setname metadata (2013, a2300607), which no longer
applies to any name established from this point forward. Warning only
at creation time reflects that once a name exists, cautioning about it
again on every later build is not actionable.
[2 lines not shown]
tests: use 14.5-RELEASE for test jail
This fixes `make check`.
(cherry picked from commit a2dbc12484f41cc482f1caa2d0c1cb0e022270f7)
Conflicts:
test/common.bulk.sh
jail.sh: skip repo update when install packages in pkgbase
pkg-install(8) manual states that the command updates pkg repositories
unless it is told not to do so:
- use `-U` flag
- set flag `REPO_AUTOUPDATE=no`
`install_from_pkgbase` first updates the repositories and then installs
base + other packages with pkg-install(8).
This change disables the repository update in pkg-install(8)
NO_ISSUE