Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 12 Jun 2022 09:13:18 -0600
From:      Warner Losh <imp@bsdimp.com>
To:        Michael Butler <imb@protected-networks.net>
Cc:        Xin LI <delphij@freebsd.org>, freebsd-current <freebsd-current@freebsd.org>
Subject:   Re: commit 695052e is incomplete
Message-ID:  <CANCZdfoGxy9=yVYaBJBnuAwQwppivAGU12-W-9b1d=MNfFUs8Q@mail.gmail.com>
In-Reply-To: <bb45eaf9-bc9c-b32e-85d7-0d01f10d49ef@protected-networks.net>
References:  <bb45eaf9-bc9c-b32e-85d7-0d01f10d49ef@protected-networks.net>

next in thread | previous in thread | raw e-mail | index | archive | help
--00000000000024018005e1419d90
Content-Type: text/plain; charset="UTF-8"

This was just fixed minutes ago... please update and confirm the fix is
good.

Warner

On Sun, Jun 12, 2022, 9:09 AM Michael Butler <imb@protected-networks.net>
wrote:

> After 695052e, the directories compat, dtrace, engines, flua, i18n and
> libxo now get created under /usr. This is one level higher than they
> should be.
>
> The fix appears to be something like ..
>
> diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
> index 9f934976b77..95a711a4418 100644
> --- a/etc/mtree/BSD.usr.dist
> +++ b/etc/mtree/BSD.usr.dist
> @@ -59,7 +59,6 @@
>                       ..
>                   ..
>                   share
> -                    ..
>                   ..
>               ..
>           ..
>
>
>

--00000000000024018005e1419d90
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"auto">This was just fixed minutes ago... please update and conf=
irm the fix is good.<div dir=3D"auto"><br></div><div dir=3D"auto">Warner=C2=
=A0</div></div><br><div class=3D"gmail_quote"><div dir=3D"ltr" class=3D"gma=
il_attr">On Sun, Jun 12, 2022, 9:09 AM Michael Butler &lt;<a href=3D"mailto=
:imb@protected-networks.net">imb@protected-networks.net</a>&gt; wrote:<br><=
/div><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-le=
ft:1px #ccc solid;padding-left:1ex">After 695052e, the directories compat, =
dtrace, engines, flua, i18n and <br>
libxo now get created under /usr. This is one level higher than they <br>
should be.<br>
<br>
The fix appears to be something like ..<br>
<br>
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist<br>
index 9f934976b77..95a711a4418 100644<br>
--- a/etc/mtree/BSD.usr.dist<br>
+++ b/etc/mtree/BSD.usr.dist<br>
@@ -59,7 +59,6 @@<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 ..<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ..<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 share<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ..<b=
r>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ..<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ..<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ..<br>
<br>
<br>
</blockquote></div>

--00000000000024018005e1419d90--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfoGxy9=yVYaBJBnuAwQwppivAGU12-W-9b1d=MNfFUs8Q>