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>
next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000003784f1060277821d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Aug 7, 2023 at 9:12=E2=80=AFAM Matthias Apitz <guru@unixarea.de> wr= ote: > El d=C3=ADa lunes, agosto 07, 2023 a las 08:51:55a. m. -0700, Kevin Oberm= an > escribi=C3=B3: > > > On Sun, Aug 6, 2023 at 9:51=E2=80=AFAM Tim Kellers <smsdtv@gmail.com> w= rote: > > > > > > > > > > > On Aug 6, 2023, at 11:05 AM, Kevin Oberman <rkoberman@gmail.com> > wrote: > > > > > > =EF=BB=BF > > > On Sat, Aug 5, 2023 at 10:51=E2=80=AFPM Matthias Apitz <guru@unixarea= .de> > wrote: > > > > > >> In the past I was used to use the following procedure to install a n= ew > > >> 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 pag= e > > 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, =E2=9C=89 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. --=20 Kevin Oberman, Part time kid herder and retired Network Engineer E-mail: rkoberman@gmail.com PGP Fingerprint: D03FB98AFA78E3B78C1694B318AB39EF1B055683 --0000000000003784f1060277821d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div dir=3D"ltr"><div class=3D"gmail_default" style=3D"fon= t-family:tahoma,sans-serif;font-size:small">On Mon, Aug 7, 2023 at 9:12=E2= =80=AFAM Matthias Apitz <<a href=3D"mailto:guru@unixarea.de">guru@unixar= ea.de</a>> wrote:</div></div><div class=3D"gmail_quote"><blockquote clas= s=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid r= gb(204,204,204);padding-left:1ex">El d=C3=ADa lunes, agosto 07, 2023 a las = 08:51:55a. m. -0700, Kevin Oberman escribi=C3=B3:<br> <br> > On Sun, Aug 6, 2023 at 9:51=E2=80=AFAM Tim Kellers <<a href=3D"mail= to:smsdtv@gmail.com" target=3D"_blank">smsdtv@gmail.com</a>> wrote:<br> > <br> > ><br> > ><br> > > On Aug 6, 2023, at 11:05 AM, Kevin Oberman <<a href=3D"mailto:= rkoberman@gmail.com" target=3D"_blank">rkoberman@gmail.com</a>> wrote:<b= r> > ><br> > > =EF=BB=BF<br> > > On Sat, Aug 5, 2023 at 10:51=E2=80=AFPM Matthias Apitz <<a hre= f=3D"mailto:guru@unixarea.de" target=3D"_blank">guru@unixarea.de</a>> wr= ote:<br> > ><br> > >> In the past I was used to use the following procedure to inst= all a new<br> > >> kernel and world:<br> > >><br> > >>=C2=A0 =C2=A0 =C2=A0# cd /usr/src<br> > >>=C2=A0 =C2=A0 =C2=A0# make installkernel<br> > >>=C2=A0 =C2=A0 =C2=A0# shutdown -r now<br> > >><br> > >>=C2=A0 =C2=A0 =C2=A0boot -s from the loader prompt<br> > >><br> > >>=C2=A0 =C2=A0 =C2=A0# adjkerntz -i<br> > >>=C2=A0 =C2=A0 =C2=A0# mount -a -t ufs<br> > >>=C2=A0 =C2=A0 =C2=A0# mergemaster -p<br> > >>=C2=A0 =C2=A0 =C2=A0# cd /usr/src<br> > >>=C2=A0 =C2=A0 =C2=A0# make installworld<br> > >>=C2=A0 =C2=A0 =C2=A0# mergemaster<br> > >>=C2=A0 =C2=A0 =C2=A0# yes | make delete-old<br> > >>=C2=A0 =C2=A0 =C2=A0# yes | make delete-old-libs<br> > >><br> > >>=C2=A0 =C2=A0 =C2=A0# reboot<br> > >><br> > ...<br> <br> > I am more confused about=C2=A0 "etcupdate -p". Both files pu= t it after the<br> > kernel installation and reboot but before the installworld. The man pa= ge<br> > for etcupdate says that '-p' it should be run before "mak= e buildworld" and<br> > I have always followed the man pages.<br> <br> The man page of mergemaster says:<br> <br> =C2=A0 =C2=A0 =C2=A0-p=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Pre-buildworld mod= e.=C2=A0 <br></blockquote><div><span class=3D"gmail_default" style=3D"font-= family:tahoma,sans-serif;font-size:small">"</span> <br></div><blockquo= te class=3D"gmail_quote" style=3D"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 mergem= aster<br> should be run (or etcupdate) without -p to adjust all the scripts below<br> /etc, /etc/rc.d/ ... I'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 a= gain.<br> <br> Will check the next time what etcupdate wants to do, because it seems<br> the sucsessor of mergemaster.<br> <br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 matthias<br> <br> -- <br> Matthias Apitz, =E2=9C=89 <a href=3D"mailto:guru@unixarea.de" target=3D"_bl= ank">guru@unixarea.de</a>, <a href=3D"http://www.unixarea.de/" rel=3D"noref= errer" target=3D"_blank">http://www.unixarea.de/</a>; +49-176-38902045<br> Public GnuPG key: <a href=3D"http://www.unixarea.de/key.pub" rel=3D"norefer= rer" target=3D"_blank">http://www.unixarea.de/key.pub</a><br>; </blockquote></div><br clear=3D"all"><div style=3D"font-family:tahoma,sans-= serif;font-size:small" class=3D"gmail_default">etcupdate is the successor t= o mergemaster.=C2=A0 It is vastly better, but does have a learning curve wh= en you first start using it. Also, it has quite a few commands that are sel= dom needed and I think that intimidates people a bit. Unless you understand= a three-way merge, it is confusing. It's not complicated, but differen= t from mergemster. (freebsd-update always has done a three-way merge.)<br><= /div><div style=3D"font-family:tahoma,sans-serif;font-size:small" class=3D"= gmail_default"><br></div><div style=3D"font-family:tahoma,sans-serif;font-s= ize:small" class=3D"gmail_default">I don't see how you get this from th= e man page. <br></div><div style=3D"font-family:tahoma,sans-serif;font-size= :small" class=3D"gmail_default">"Compares only files known to be<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0essential to = the success of {build|install}world, i.e.,<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/etc/group an= d /etc/master.passwd.</div><div style=3D"font-family:tahoma,sans-serif;font= -size:small" class=3D"gmail_default"><br></div><div style=3D"font-family:ta= homa,sans-serif;font-size:small" class=3D"gmail_default">If it is potential= ly updating files that MIGHT be essential to a successful buildworld, runni= ng it after buildkernel seems quite wrong. At least I read {build|install}w= orld as buildworld or installworld.<br></div><br><span class=3D"gmail_signa= ture_prefix">-- </span><br><div dir=3D"ltr" class=3D"gmail_signature"><div = dir=3D"ltr"><div><div dir=3D"ltr"><div><div dir=3D"ltr"><div><div dir=3D"lt= r">Kevin Oberman, Part time kid herder and retired Network Engineer<br>E-ma= il: <a href=3D"mailto:rkoberman@gmail.com" target=3D"_blank">rkoberman@gmai= l.com</a><br></div><div>PGP Fingerprint: D03FB98AFA78E3B78C1694B318AB39EF1B= 055683</div></div></div></div></div></div></div></div></div> --0000000000003784f1060277821d--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAN6yY1tFAxofH1JfkwfAZGuZ96BcvHHErS=64jWFr2E1zMha6w>