On Fri, Apr 12, 2024 at 09:32:31PM +0200, Rafael Sadowski wrote:
> Here is a diff that sorts the proot(1) actions alphabetically.
> 
> OK?
> 

hi.

the page also says that the actions are listed "in the order of
execution". won;t this diff mess that up?

jmc

> Index: proot.1
> ===================================================================
> RCS file: /cvs/src/share/man/man1/proot.1,v
> diff -u -p -r1.11 proot.1
> --- proot.1	11 Apr 2023 11:23:09 -0000	1.11
> +++ proot.1	12 Apr 2024 19:27:26 -0000
> @@ -65,54 +65,34 @@ Possible
>  .It Cm check_mount
>  Verify the state of mount points in the system, specifically whether
>  the chroot area is not nodev.
> -.It Cm unpopulate
> -Remove everything from the chroot apart from selected data.
> -See
> -.Sx Preserved areas and unpopulate
> -for details.
> -.It Cm snapshot
> -Copy things from a snapshot,
> -to be retrieved from a URL or from the local filesystem.
> -.It Cm trusted_snapshot
> -Like
> -.Cm snapshot ,
> -but without signature checking.
> -Use with caution, usually with snapshots you've built yourself.
> -.It Cm locate
> -Copy things from the base system, perusing the system
> -.Xr locate 1
> -databases.
> -.Bf Sy
> -Note that this might erase data, in case it doesn't match the base system
> -and is in the way.
> -.Ef
> -.It Cm resolv
> -Copy the system
> -.Xr resolv.conf 5
> -and
> -.Xr hosts 5
> -files.
> +.It Cm check_symlinks
> +Report absolute symlinks that exist under the
> +.Ar chroot ,
> +white-listing known base system links.
> +.It Cm checkout_ports
> +Check out a ports tree from cvs using a provided
> +.Cm portscvs
> +location.
>  .It Cm copy_ports
>  Copy the ports tree.
>  .It Cm copy_sys
>  Copy system include files (deprecated).
> -.It Cm unpopulate_light
> -Remove everything from the chroot apart from selected data.
> -See
> -.Sx Preserved areas and unpopulate
> -for details.
> -.It Cm ldconfig
> -Rerun
> -.Xr ldconfig 8 .
>  .It Cm devs
>  Regenerate devices using
>  .Xr MAKEDEV 8
>  and
>  .Xr dev_mkdb 8 .
> -.It Cm checkout_ports
> -Check out a ports tree from cvs using a provided
> -.Cm portscvs
> -location.
> +.It Cm ldconfig
> +Rerun
> +.Xr ldconfig 8 .
> +.It Cm locate
> +Copy things from the base system, perusing the system
> +.Xr locate 1
> +databases.
> +.Bf Sy
> +Note that this might erase data, in case it doesn't match the base system
> +and is in the way.
> +.Ef
>  .It Cm ports_subdirs
>  Create ports infrastructure subdirs, according to users required for
>  .Xr dpb 1 .
> @@ -121,17 +101,37 @@ If
>  is set to 1,
>  .Xr chown 2
>  any content within to the appropriate users.
> +.It Cm resolv
> +Copy the system
> +.Xr resolv.conf 5
> +and
> +.Xr hosts 5
> +files.
> +.It Cm snapshot
> +Copy things from a snapshot,
> +to be retrieved from a URL or from the local filesystem.
>  .It Cm stragglers
>  Double-check filled up chroot for files we don't know about.
> +.It Cm trusted_snapshot
> +Like
> +.Cm snapshot ,
> +but without signature checking.
> +Use with caution, usually with snapshots you've built yourself.
> +.It Cm unpopulate
> +Remove everything from the chroot apart from selected data.
> +See
> +.Sx Preserved areas and unpopulate
> +for details.
> +.It Cm unpopulate_light
> +Remove everything from the chroot apart from selected data.
> +See
> +.Sx Preserved areas and unpopulate
> +for details.
>  .It Cm write_mk
>  If some values are different from the default,
>  write a skeleton
>  .Xr mk.conf 5
>  file.
> -.It Cm check_symlinks
> -Report absolute symlinks that exist under the
> -.Ar chroot ,
> -white-listing known base system links.
>  .El
>  .Pp
>  By default,
>