Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Jun 2022 07:45:09 -0700
From:      Xin Li <delphij@delphij.net>
To:        Dimitry Andric <dim@FreeBSD.org>, Xin LI <delphij@FreeBSD.org>
Cc:        "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org>
Subject:   Re: git: 695052e240c7 - main - Fix mtree for usr/
Message-ID:  <34b14fc7-a070-9922-4796-a1b0a64b4fc7@delphij.net>
In-Reply-To: <96909128-F515-4C51-A959-2F65A2C84BE5@FreeBSD.org>
References:  <202206120440.25C4eRl4078291@gitrepo.freebsd.org> <7BF2DCD4-C7CB-46C5-B885-EAF7BA7C5263@FreeBSD.org> <96909128-F515-4C51-A959-2F65A2C84BE5@FreeBSD.org>

next in thread | previous in thread | raw e-mail | index | archive | help


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? :)

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...)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?34b14fc7-a070-9922-4796-a1b0a64b4fc7>