# HG changeset patch # User Franz Glasner # Date 1717573050 -7200 # Node ID 1aa75c6d3ef6e44ccaabc69edfd54e091edb0457 # Parent 34f9f8c242237484df657c8b7102fa1582ec156b FIX: man pages are now in $PREFIX/share/man instead of $PREFIX/man diff -r 34f9f8c24223 -r 1aa75c6d3ef6 Makefile --- a/Makefile Wed Jun 05 09:08:56 2024 +0200 +++ b/Makefile Wed Jun 05 09:37:30 2024 +0200 @@ -104,10 +104,10 @@ post-install-DOCS-on: .for _mp in ${MANPAGES5:R} - ${INSTALL_DATA} ${WRKSRC}/docs/_build/man/${_mp}.5 ${STAGEDIR}${PREFIX}/man/man5/${_mp}.5 + ${INSTALL_MAN} ${WRKSRC}/docs/_build/man/${_mp}.5 ${STAGEDIR}${PREFIX}/share/man/man5 .endfor .for _mp in ${MANPAGES8:R} - ${INSTALL_DATA} ${WRKSRC}/docs/_build/man/${_mp}.8 ${STAGEDIR}${PREFIX}/man/man8/${_mp}.8 + ${INSTALL_MAN} ${WRKSRC}/docs/_build/man/${_mp}.8 ${STAGEDIR}${PREFIX}/share/man/man8 .endfor .include diff -r 34f9f8c24223 -r 1aa75c6d3ef6 docs/man/man8/ftjail-populate-tmpl.rst --- a/docs/man/man8/ftjail-populate-tmpl.rst Wed Jun 05 09:08:56 2024 +0200 +++ b/docs/man/man8/ftjail-populate-tmpl.rst Wed Jun 05 09:37:30 2024 +0200 @@ -6,9 +6,9 @@ Synopsis -------- -**ftjail populate-tmpl** **-L** `directory` `path/to/base.txz` +**ftjail populate-tmpl** [**-b**] **-L** `directory` `path/to/base.txz` [`path/to/kernel.txz`] -**ftjail populate-tmpl** **-P** `directory` `path/to/base.txz` +**ftjail populate-tmpl** [**-b**] **-P** `directory` `path/to/base.txz` [`path/to/kernel.txz`] Description @@ -17,6 +17,8 @@ Populate the directory in `directory` with a FreeBSD base system. The base system's archive ist in `path/to/base.txz`. +Optionally a FreeBSD kernel can be extracted also. + The directory in `directory` must already have a proper directory layout. This can be accomplished by :manpage:`ftjail-mount-tmpl(8)`. @@ -40,6 +42,11 @@ Copy dataset properties optimized for direct mounts of skeleton children over an already mounted base. +.. option:: -b + + Do not remove the ``/boot`` folder in `directory` but preserve it. + This option is implied if a `path/to/kernel.txz` is given. + See Also -------- diff -r 34f9f8c24223 -r 1aa75c6d3ef6 pkg-plist --- a/pkg-plist Wed Jun 05 09:08:56 2024 +0200 +++ b/pkg-plist Wed Jun 05 09:37:30 2024 +0200 @@ -11,33 +11,33 @@ share/local-bsdtools/common.subr share/examples/local-bsdtools/freebsd-update-ftjail-template.sh share/examples/local-bsdtools/freebsd-update-ftjail.sh -%%DOCS%%man/man5/bsmtp2dma.conf.5.gz -%%DOCS%%man/man5/local-bsdtools-periodic.5.gz -%%DOCS%%man/man5/package-mapping.conf.5.gz -%%DOCS%%man/man5/pkgtools.conf.5.gz -%%DOCS%%man/man8/local-bsdtools.8.gz -%%DOCS%%man/man8/bsmtp2dma.8.gz -%%DOCS%%man/man8/check-ports.8.gz -%%DOCS%%man/man8/fjail.8.gz -%%DOCS%%man/man8/fjail-configure.8.gz -%%DOCS%%man/man8/fjail-freebsd-update.8.gz -%%DOCS%%man/man8/fjail-hostid.8.gz -%%DOCS%%man/man8/fpkg.8.gz -%%DOCS%%man/man8/ftjail.8.gz -%%DOCS%%man/man8/ftjail-build-etcupdate-current-tmpl.8.gz -%%DOCS%%man/man8/ftjail-copy-skel.8.gz -%%DOCS%%man/man8/ftjail-datasets-tmpl.8.gz -%%DOCS%%man/man8/ftjail-freebsd-update.8.gz -%%DOCS%%man/man8/ftjail-interlink-tmpl.8.gz -%%DOCS%%man/man8/ftjail-mount-tmpl.8.gz -%%DOCS%%man/man8/ftjail-populate-tmpl.8.gz -%%DOCS%%man/man8/ftjail-snapshot-tmpl.8.gz -%%DOCS%%man/man8/ftjail-umount-tmpl.8.gz -%%DOCS%%man/man8/fzfs.8.gz -%%DOCS%%man/man8/fzfs-copy-tree.8.gz -%%DOCS%%man/man8/fzfs-create-tree.8.gz -%%DOCS%%man/man8/fzfs-mount.8.gz -%%DOCS%%man/man8/fzfs-umount.8.gz +%%DOCS%%share/man/man5/bsmtp2dma.conf.5.gz +%%DOCS%%share/man/man5/local-bsdtools-periodic.5.gz +%%DOCS%%share/man/man5/package-mapping.conf.5.gz +%%DOCS%%share/man/man5/pkgtools.conf.5.gz +%%DOCS%%share/man/man8/local-bsdtools.8.gz +%%DOCS%%share/man/man8/bsmtp2dma.8.gz +%%DOCS%%share/man/man8/check-ports.8.gz +%%DOCS%%share/man/man8/fjail.8.gz +%%DOCS%%share/man/man8/fjail-configure.8.gz +%%DOCS%%share/man/man8/fjail-freebsd-update.8.gz +%%DOCS%%share/man/man8/fjail-hostid.8.gz +%%DOCS%%share/man/man8/fpkg.8.gz +%%DOCS%%share/man/man8/ftjail.8.gz +%%DOCS%%share/man/man8/ftjail-build-etcupdate-current-tmpl.8.gz +%%DOCS%%share/man/man8/ftjail-copy-skel.8.gz +%%DOCS%%share/man/man8/ftjail-datasets-tmpl.8.gz +%%DOCS%%share/man/man8/ftjail-freebsd-update.8.gz +%%DOCS%%share/man/man8/ftjail-interlink-tmpl.8.gz +%%DOCS%%share/man/man8/ftjail-mount-tmpl.8.gz +%%DOCS%%share/man/man8/ftjail-populate-tmpl.8.gz +%%DOCS%%share/man/man8/ftjail-snapshot-tmpl.8.gz +%%DOCS%%share/man/man8/ftjail-umount-tmpl.8.gz +%%DOCS%%share/man/man8/fzfs.8.gz +%%DOCS%%share/man/man8/fzfs-copy-tree.8.gz +%%DOCS%%share/man/man8/fzfs-create-tree.8.gz +%%DOCS%%share/man/man8/fzfs-mount.8.gz +%%DOCS%%share/man/man8/fzfs-umount.8.gz @sample %%ETCDIR%%/bsmtp2dma.conf.sample @sample %%ETCDIR%%/package-mapping.conf.sample @sample %%ETCDIR%%/pkgtools.conf.sample