From nobody Wed Aug 09 06:22:32 2023 X-Original-To: freebsd-current@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLKjm66nVz4mGkY for ; Wed, 9 Aug 2023 06:22:52 +0000 (UTC) (envelope-from kob6558@gmail.com) Received: from mail-yw1-x1132.google.com (mail-yw1-x1132.google.com [IPv6:2607:f8b0:4864:20::1132]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLKjk46Wcz4L6X for ; Wed, 9 Aug 2023 06:22:50 +0000 (UTC) (envelope-from kob6558@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20221208 header.b=k3u4Z467; spf=pass (mx1.freebsd.org: domain of kob6558@gmail.com designates 2607:f8b0:4864:20::1132 as permitted sender) smtp.mailfrom=kob6558@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-yw1-x1132.google.com with SMTP id 00721157ae682-58451f0fefeso74549077b3.3 for ; Tue, 08 Aug 2023 23:22:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691562169; x=1692166969; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=Z47ZkRsojEmnT6R165gGc12Yum/Y8w7iVWiSiYIKv+E=; b=k3u4Z467udZDRm7QQLIe+1qwN8C/rYGVfiCSyK1ocRrGLadcVhfUqJ1C3J+pRlOODS v38JXsavLNmm653JAlnlvgt7sDZamXtkY70EU8Pcfbt7xLgLVInW1Fy+sMpDobEcw/jv 87K3+FthlWvtc4EsKvrZ/Mh3vILzIKDlAq67iVxWjgnZNpzWRW9p1XfzOIowFRtQtYDm tpgp3FJspzAsfkhYO6+l3WB1G+qVXRi9wchek6JvCTQEaCoYglHovIQgApqPH/s8fVpm l1gJhsis/8tIQ4baq7l5+bsdMTDW3FfjcbB8KTBQVIHXkIDeLuK6YVb2mQ4/9pVbyzaJ 6nFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691562169; x=1692166969; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Z47ZkRsojEmnT6R165gGc12Yum/Y8w7iVWiSiYIKv+E=; b=RpwsHRVdakGBc+c//ga+Jb1l9Pp54p2BQvMZ8gR9rdHZ/wETtV2RB41W5dP7ik/e20 DLEzyB970WWLH0bAeEXo8Sv2+LL3W1/MYplSMEQfBC66MONCcyt8EDSemD9IgInvPKXw yKQz0wx9Zd97uVdq5WuTilXP8eDtmudr201ecyJ9nfpiWYdsI5FkwTK+JEdJyNUsvBAN ZkYE2qIG2SHYThN0eoUEx/aUlzx05HY5Hi0MDSQNfi+RKPEbRxwJyKix6oF6nXyDtLGk hezE73LjctNEcrMhnp15FkiX4zLSHsjyY7R9roROW36MMDcGes+UO2yP6P+Tt7Xm4osm 1kWg== X-Gm-Message-State: AOJu0YwOztWNYmkVDMof6koReAhoa3l1b3CZwcZ4UCSpKe0S6AzseSRx 8FlARiJZPLRaOGoA8UbI4e5m390PIjxmwQDlo90= X-Google-Smtp-Source: AGHT+IGoAie4a2kWFyWM5xnUAUXAKfm0QHSJ6tkMqMFjz7zY98qQ5+SMxpccjQifVvn5kkprAIXMTAuvDj7/GmVwt1s= X-Received: by 2002:a5b:48b:0:b0:d0a:127e:7478 with SMTP id n11-20020a5b048b000000b00d0a127e7478mr1514832ybp.44.1691562169303; Tue, 08 Aug 2023 23:22:49 -0700 (PDT) List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 References: <7A0E604D-EF40-4F10-B597-F1F076507192@gmail.com> In-Reply-To: From: Kevin Oberman Date: Tue, 8 Aug 2023 23:22:32 -0700 Message-ID: Subject: Re: Has the update procedure changed? To: Matthias Apitz , Kevin Oberman , Tim Kellers , freebsd-current@freebsd.org Content-Type: multipart/alternative; boundary="0000000000003784f1060277821d" X-Spamd-Result: default: False [-2.70 / 15.00]; SUBJECT_ENDS_QUESTION(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; FORGED_SENDER(0.30)[rkoberman@gmail.com,kob6558@gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20221208]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_SOME(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[rkoberman@gmail.com,kob6558@gmail.com]; DKIM_TRACE(0.00)[gmail.com:+]; MID_RHS_MATCH_FROMTLD(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FREEMAIL_TO(0.00)[unixarea.de,gmail.com,freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::1132:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MLMMJ_DEST(0.00)[freebsd-current@freebsd.org] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4RLKjk46Wcz4L6X --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 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 w= rote: > > > > > > > > > > > On Aug 6, 2023, at 11:05 AM, Kevin Oberman > wrote: > > > > > > =EF=BB=BF > > > On Sat, Aug 5, 2023 at 10:51=E2=80=AFPM Matthias Apitz > 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
On Mon, Aug 7, 2023 at 9:12=E2= =80=AFAM Matthias Apitz <guru@unixar= ea.de> wrote:
El d=C3=ADa lunes, agosto 07, 2023 a las = 08:51:55a. m. -0700, Kevin Oberman escribi=C3=B3:

> On Sun, Aug 6, 2023 at 9:51=E2=80=AFAM Tim Kellers <smsdtv@gmail.com> wrote:
>
> >
> >
> > 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> wr= ote:
> >
> >> In the past I was used to use the following procedure to inst= all a new
> >> kernel and world:
> >>
> >>=C2=A0 =C2=A0 =C2=A0# cd /usr/src
> >>=C2=A0 =C2=A0 =C2=A0# make installkernel
> >>=C2=A0 =C2=A0 =C2=A0# shutdown -r now
> >>
> >>=C2=A0 =C2=A0 =C2=A0boot -s from the loader prompt
> >>
> >>=C2=A0 =C2=A0 =C2=A0# adjkerntz -i
> >>=C2=A0 =C2=A0 =C2=A0# mount -a -t ufs
> >>=C2=A0 =C2=A0 =C2=A0# mergemaster -p
> >>=C2=A0 =C2=A0 =C2=A0# cd /usr/src
> >>=C2=A0 =C2=A0 =C2=A0# make installworld
> >>=C2=A0 =C2=A0 =C2=A0# mergemaster
> >>=C2=A0 =C2=A0 =C2=A0# yes | make delete-old
> >>=C2=A0 =C2=A0 =C2=A0# yes | make delete-old-libs
> >>
> >>=C2=A0 =C2=A0 =C2=A0# reboot
> >>
> ...

> I am more confused about=C2=A0 "etcupdate -p". Both files pu= t it after the
> kernel installation and reboot but before the installworld. The man pa= ge
> for etcupdate says that '-p' it should be run before "mak= e buildworld" and
> I have always followed the man pages.

The man page of mergemaster says:

=C2=A0 =C2=A0 =C2=A0-p=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Pre-buildworld mod= e.=C2=A0
"

i.e. it must be run after installkernel and before installworld to
adjust the new /etc/group and /etc/master.passwd. After installworld mergem= aster
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<= br> 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 a= gain.

Will check the next time what etcupdate wants to do, because it seems
the sucsessor of mergemaster.

=C2=A0 =C2=A0 =C2=A0 =C2=A0 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 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.)
<= /div>

I don't see how you get this from th= e man page.
"Compares only files known to be
=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.,
=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.

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.

--
Kevin Oberman, Part time kid herder and retired Network Engineer
E-ma= il: rkoberman@gmai= l.com
PGP Fingerprint: D03FB98AFA78E3B78C1694B318AB39EF1B= 055683
--0000000000003784f1060277821d--