Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Aug 2023 23:22:32 -0700
From:      Kevin Oberman <rkoberman@gmail.com>
To:        Matthias Apitz <guru@unixarea.de>, Kevin Oberman <rkoberman@gmail.com>,  Tim Kellers <smsdtv@gmail.com>, freebsd-current@freebsd.org
Subject:   Re: Has the update procedure changed?
Message-ID:  <CAN6yY1tFAxofH1JfkwfAZGuZ96BcvHHErS=64jWFr2E1zMha6w@mail.gmail.com>
In-Reply-To: <ZNEXzR0IL7%2BIDShe@c720-r368166>
References:  <CAN6yY1tiq4XQT_apnLo_aDgoMPEZ%2BZ4PfB8uqfMw3PeJbMGMqw@mail.gmail.com> <7A0E604D-EF40-4F10-B597-F1F076507192@gmail.com> <CAN6yY1teCLbtaN6V-fQqa0WTvrbWaOjy%2BB7F=bSq3t0Ue_ROVw@mail.gmail.com> <ZNEXzR0IL7%2BIDShe@c720-r368166>

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

[-- Attachment #1 --]
On Mon, Aug 7, 2023 at 9:12 AM Matthias Apitz <guru@unixarea.de> wrote:

> El día lunes, agosto 07, 2023 a las 08:51:55a. m. -0700, Kevin Oberman
> escribió:
>
> > On Sun, Aug 6, 2023 at 9:51 AM Tim Kellers <smsdtv@gmail.com> wrote:
> >
> > >
> > >
> > > On Aug 6, 2023, at 11:05 AM, Kevin Oberman <rkoberman@gmail.com>
> wrote:
> > >
> > > 
> > > On Sat, Aug 5, 2023 at 10:51 PM Matthias Apitz <guru@unixarea.de>
> wrote:
> > >
> > >> In the past I was used to use the following procedure to install a new
> > >> kernel and world:
> > >>
> > >>     # cd /usr/src
> > >>     # make installkernel
> > >>     # shutdown -r now
> > >>
> > >>     boot -s from the loader prompt
> > >>
> > >>     # adjkerntz -i
> > >>     # mount -a -t ufs
> > >>     # mergemaster -p
> > >>     # cd /usr/src
> > >>     # make installworld
> > >>     # mergemaster
> > >>     # yes | make delete-old
> > >>     # yes | make delete-old-libs
> > >>
> > >>     # reboot
> > >>
> > ...
>
> > I am more confused about  "etcupdate -p". Both files put it after the
> > kernel installation and reboot but before the installworld. The man page
> > for etcupdate says that '-p' it should be run before "make buildworld"
> and
> > I have always followed the man pages.
>
> The man page of mergemaster says:
>
>      -p          Pre-buildworld mode.
>
"

>
> i.e. it must be run after installkernel and before installworld to
> adjust the new /etc/group and /etc/master.passwd. After installworld
> mergemaster
> should be run (or etcupdate) without -p to adjust all the scripts below
> /etc, /etc/rc.d/ ... I've used this procedure above for many years and
> it always let me decide it I want the new or the old or deal later with
> the diff of all these files. And so I did it yesterday and it worked fine
> again.
>
> Will check the next time what etcupdate wants to do, because it seems
> the sucsessor of mergemaster.
>
>         matthias
>
> --
> Matthias Apitz, ✉ guru@unixarea.de, http://www.unixarea.de/
> +49-176-38902045
> Public GnuPG key: http://www.unixarea.de/key.pub
>

etcupdate is the successor to mergemaster.  It is vastly better, but does
have a learning curve when you first start using it. Also, it has quite a
few commands that are seldom needed and I think that intimidates people a
bit. Unless you understand a three-way merge, it is confusing. It's not
complicated, but different from mergemster. (freebsd-update always has done
a three-way merge.)

I don't see how you get this from the man page.
"Compares only files known to be
                 essential to the success of {build|install}world, i.e.,
                 /etc/group and /etc/master.passwd.

If it is potentially updating files that MIGHT be essential to a successful
buildworld, running it after buildkernel seems quite wrong. At least I read
{build|install}world as buildworld or installworld.

-- 
Kevin Oberman, Part time kid herder and retired Network Engineer
E-mail: rkoberman@gmail.com
PGP Fingerprint: D03FB98AFA78E3B78C1694B318AB39EF1B055683

[-- Attachment #2 --]
<div dir="ltr"><div dir="ltr"><div class="gmail_default" style="font-family:tahoma,sans-serif;font-size:small">On Mon, Aug 7, 2023 at 9:12 AM Matthias Apitz &lt;<a href="mailto:guru@unixarea.de">guru@unixarea.de</a>&gt; wrote:</div></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">El día lunes, agosto 07, 2023 a las 08:51:55a. m. -0700, Kevin Oberman escribió:<br>
<br>
&gt; On Sun, Aug 6, 2023 at 9:51 AM Tim Kellers &lt;<a href="mailto:smsdtv@gmail.com" target="_blank">smsdtv@gmail.com</a>&gt; wrote:<br>
&gt; <br>
&gt; &gt;<br>
&gt; &gt;<br>
&gt; &gt; On Aug 6, 2023, at 11:05 AM, Kevin Oberman &lt;<a href="mailto:rkoberman@gmail.com" target="_blank">rkoberman@gmail.com</a>&gt; wrote:<br>
&gt; &gt;<br>
&gt; &gt; <br>
&gt; &gt; On Sat, Aug 5, 2023 at 10:51 PM Matthias Apitz &lt;<a href="mailto:guru@unixarea.de" target="_blank">guru@unixarea.de</a>&gt; wrote:<br>
&gt; &gt;<br>
&gt; &gt;&gt; In the past I was used to use the following procedure to install a new<br>
&gt; &gt;&gt; kernel and world:<br>
&gt; &gt;&gt;<br>
&gt; &gt;&gt;     # cd /usr/src<br>
&gt; &gt;&gt;     # make installkernel<br>
&gt; &gt;&gt;     # shutdown -r now<br>
&gt; &gt;&gt;<br>
&gt; &gt;&gt;     boot -s from the loader prompt<br>
&gt; &gt;&gt;<br>
&gt; &gt;&gt;     # adjkerntz -i<br>
&gt; &gt;&gt;     # mount -a -t ufs<br>
&gt; &gt;&gt;     # mergemaster -p<br>
&gt; &gt;&gt;     # cd /usr/src<br>
&gt; &gt;&gt;     # make installworld<br>
&gt; &gt;&gt;     # mergemaster<br>
&gt; &gt;&gt;     # yes | make delete-old<br>
&gt; &gt;&gt;     # yes | make delete-old-libs<br>
&gt; &gt;&gt;<br>
&gt; &gt;&gt;     # reboot<br>
&gt; &gt;&gt;<br>
&gt; ...<br>
<br>
&gt; I am more confused about  &quot;etcupdate -p&quot;. Both files put it after the<br>
&gt; kernel installation and reboot but before the installworld. The man page<br>
&gt; for etcupdate says that &#39;-p&#39; it should be run before &quot;make buildworld&quot; and<br>
&gt; I have always followed the man pages.<br>
<br>
The man page of mergemaster says:<br>
<br>
     -p          Pre-buildworld mode.  <br></blockquote><div><span class="gmail_default" style="font-family:tahoma,sans-serif;font-size:small">&quot;</span> <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
i.e. it must be run after installkernel and before installworld to<br>
adjust the new /etc/group and /etc/master.passwd. After installworld mergemaster<br>
should be run (or etcupdate) without -p to adjust all the scripts below<br>
/etc, /etc/rc.d/ ... I&#39;ve used this procedure above for many years and<br>
it always let me decide it I want the new or the old or deal later with<br>
the diff of all these files. And so I did it yesterday and it worked fine again.<br>
<br>
Will check the next time what etcupdate wants to do, because it seems<br>
the sucsessor of mergemaster.<br>
<br>
        matthias<br>
<br>
-- <br>
Matthias Apitz, ✉ <a href="mailto:guru@unixarea.de" target="_blank">guru@unixarea.de</a>, <a href="http://www.unixarea.de/" rel="noreferrer" target="_blank">http://www.unixarea.de/</a>; +49-176-38902045<br>
Public GnuPG key: <a href="http://www.unixarea.de/key.pub" rel="noreferrer" target="_blank">http://www.unixarea.de/key.pub</a><br>;
</blockquote></div><br clear="all"><div style="font-family:tahoma,sans-serif;font-size:small" class="gmail_default">etcupdate is the successor to mergemaster.  It is vastly better, but does have a learning curve when you first start using it. Also, it has quite a few commands that are seldom needed and I think that intimidates people a bit. Unless you understand a three-way merge, it is confusing. It&#39;s not complicated, but different from mergemster. (freebsd-update always has done a three-way merge.)<br></div><div style="font-family:tahoma,sans-serif;font-size:small" class="gmail_default"><br></div><div style="font-family:tahoma,sans-serif;font-size:small" class="gmail_default">I don&#39;t see how you get this from the man page. <br></div><div style="font-family:tahoma,sans-serif;font-size:small" class="gmail_default">&quot;Compares only files known to be<br>
                 essential to the success of {build|install}world, i.e.,<br>
                 /etc/group and /etc/master.passwd.</div><div style="font-family:tahoma,sans-serif;font-size:small" class="gmail_default"><br></div><div style="font-family:tahoma,sans-serif;font-size:small" class="gmail_default">If it is potentially updating files that MIGHT be essential to a successful buildworld, running it after buildkernel seems quite wrong. At least I read {build|install}world as buildworld or installworld.<br></div><br><span class="gmail_signature_prefix">-- </span><br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr">Kevin Oberman, Part time kid herder and retired Network Engineer<br>E-mail: <a href="mailto:rkoberman@gmail.com" target="_blank">rkoberman@gmail.com</a><br></div><div>PGP Fingerprint: D03FB98AFA78E3B78C1694B318AB39EF1B055683</div></div></div></div></div></div></div></div></div>
help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAN6yY1tFAxofH1JfkwfAZGuZ96BcvHHErS=64jWFr2E1zMha6w>