Re: git: 695052e240c7 - main - Fix mtree for usr/

From: Rodney W. Grimes <freebsd_at_gndrsh.dnsmgr.net>
Date: Tue, 14 Jun 2022 00:47:30 UTC
> 
> On 6/12/22 07:26, Dimitry Andric wrote:
> > On 12 Jun 2022, at 10:49, Dimitry Andric <dim@FreeBSD.org> wrote:
> >>
> >> On 12 Jun 2022, at 06:40, Xin LI <delphij@FreeBSD.org> wrote:
> >>>
> >>> The branch main has been updated by delphij:
> >>>
> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=695052e240c7c4291707a55358fe79de9ef79767
> >>>
> >>> commit 695052e240c7c4291707a55358fe79de9ef79767
> >>> Author:     Xin LI <delphij@FreeBSD.org>
> >>> AuthorDate: 2022-06-12 04:37:15 +0000
> >>> Commit:     Xin LI <delphij@FreeBSD.org>
> >>> CommitDate: 2022-06-12 04:38:05 +0000
> >>>
> >>>    Fix mtree for usr/
> >>>
> >>>    MFC after:      3 days
> >>> ---
> >>> etc/mtree/BSD.usr.dist | 1 +
> >>> 1 file changed, 1 insertion(+)
> >>>
> >>> diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
> >>> index 92ed996d4b39..9f934976b77e 100644
> >>> --- a/etc/mtree/BSD.usr.dist
> >>> +++ b/etc/mtree/BSD.usr.dist
> >>> @@ -57,6 +57,7 @@
> >>>                 lib
> >>>                     freebsd
> >>>                     ..
> >>> +                ..
> >>>                 share
> >>>                     ..
> >>>                 ..
> >>
> >> Thanks! Apologies for the mistake, I always have trouble with the mtree format. :)
> > 
> > Now that I'm looking at the file *again* I think that:
> > 
> >                  lib
> >                      freebsd
> >                      ..
> >                  ..
> >                  share
> >                      ..
> >                  ..
> > 
> > should really be:
> > 
> >                  lib
> >                      freebsd
> >                      ..
> >                  ..
> >                  share
> >                  ..
> > 
> > because otherwise it is descending one level too far?
> > 
> > Is there any sort of "sanity checker" for these files? :)

Have you read the README file in the mtree directory?


> Awww... my bad.  (I usually used mtree to generate a new one and then 
> merge them into the existing .dist files, but looks like some recent 
> mtree change have modified the generated format...)

Oh, thats bad news.

-- 
Rod Grimes                                                 rgrimes@freebsd.org