From nobody Sun Nov 06 17:35:47 2022 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 4N51js5DWNz4ggpm for ; Sun, 6 Nov 2022 17:36:01 +0000 (UTC) (envelope-from ggm@algebras.org) Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) (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 4N51jr6jxtz3n5B for ; Sun, 6 Nov 2022 17:35:59 +0000 (UTC) (envelope-from ggm@algebras.org) Received: by mail-lf1-x135.google.com with SMTP id j4so13973894lfk.0 for ; Sun, 06 Nov 2022 09:35:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=algebras-org.20210112.gappssmtp.com; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=6JBcAc6PhI1qyJDSfKWwPCZm7K+E4Fuqg4IgTGtgEls=; b=nmUohGOn/ZbIc2fnNkVAdS5CNSLfirLwxczL+Xzia2FRnMFh7QhBG25tP9BbOuyJVe NoZ8ZnqEmiNvPDVERkG9NLlVwnzbBHt5BnZWK9Fa5SD3Q+WzRvfFivUNA6k1gcflHKhe jJlTF+UsCN1KjmQ/NSL3P3vZjUfABMtUgAcA7gzby5t+jbdlVVD6rQvC/Vy/zXJeiOcg IbpzHg+ZiJqBw7a3qUzqpDTxr6Zq1KajHpYbxec675+5lsvsHPk6TqRpOfhYvdIzDvNP g57WABpx4N5pwdMIEt95ptK7mmNxXvF+XZYlhnAB61kROaonCYe1Sk1cTzxUi5pXb+Uf DUCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=6JBcAc6PhI1qyJDSfKWwPCZm7K+E4Fuqg4IgTGtgEls=; b=Tr93ijMt9J7lp1H8pw+yfnN8j6sG9F9/qxbK0M8acd8DtxOnf4wzQKYxCn7EFxMa+z F+WFlwBKVMPRlZeGnAbQ/37BVw88WjuVXLRrseyl3lYjXlrzs6WHhCZ3BC8FYfBb5SJx pZZCerVAveMRqRIFWOscI2r0kGykP3HEJnjMbjkhPQQ1uXaq89JRypbsg9BFRdii1fmY u5DotAdMaGJE2LDDpmGTBWRDb3WsdnvR8rqMdgaG0Iz3IEKHK4Y1vSlk/jRi9leNb6CI sZtqYGjd1AJSLrVn0PhOGWLhNkqJrcIgI9ipQ+v4oB699a4YL5fVp0jLxRh7G5AcuhlL iSnQ== X-Gm-Message-State: ACrzQf2REyZBO+BvADHFcbz06vrGLacPIM7PoWSBiX7uFEACPzje+MuR k13g/rHWjzubyO+bE4Y+DGqPOn+FKulbg2rQbStroJ/6JW2P1Q== X-Google-Smtp-Source: AMsMyM7sZt/RJrU/j9RrRFjaVHMs95HpZkWI86uviZeSEMqF87V+M58bJuVSUPmt48Gv8KXTYlpxul8ZrFd598dPJA0= X-Received: by 2002:ac2:58cb:0:b0:4a2:6e08:2c50 with SMTP id u11-20020ac258cb000000b004a26e082c50mr17524886lfo.135.1667756158290; Sun, 06 Nov 2022 09:35:58 -0800 (PST) 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: <20221021175142.GA62386@www.zefox.net> <0697DE1F-C626-4289-894A-4141CDF1B91B@yahoo.com> <71AB9FAC-EB00-48F0-B0DD-0629C2D3C8C0@googlemail.com> <5719632F-8A92-4784-88D8-EAE3F20F2FA3@yahoo.com> <20221024174930.GA79381@www.zefox.net> <20221025005012.GA80394@www.zefox.net> <605A6723-5D31-495C-8200-FD107115FC81@yahoo.com> <20221106031204.GA45827@www.zefox.net> <20221106210716.1c997091ca40ea02ede9f159@dec.sakura.ne.jp> In-Reply-To: <20221106210716.1c997091ca40ea02ede9f159@dec.sakura.ne.jp> From: George Michaelson Date: Sun, 6 Nov 2022 17:35:47 +0000 Message-ID: Subject: Re: Seeking an idiot's guide to etcupdate/mergemaster To: freebsd-current@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4N51jr6jxtz3n5B X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=algebras-org.20210112.gappssmtp.com header.s=20210112 header.b=nmUohGOn; dmarc=none; spf=pass (mx1.freebsd.org: domain of ggm@algebras.org designates 2a00:1450:4864:20::135 as permitted sender) smtp.mailfrom=ggm@algebras.org X-Spamd-Result: default: False [-3.50 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; R_DKIM_ALLOW(-0.20)[algebras-org.20210112.gappssmtp.com:s=20210112]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::135:from]; MIME_TRACE(0.00)[0:+]; MLMMJ_DEST(0.00)[freebsd-current@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[algebras-org.20210112.gappssmtp.com:+]; ARC_NA(0.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[algebras.org]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N I am probably alone in this but I find the CVS style <<<<>>>> markers in the update diffs intensely confusing. Given many merges are large blocks, its almost impossible to keep context flitting about in vi to find the old/new insertions. The odd thing is that post edit, the view you get afterward is traditional diff/patch mode, so its really bizarre: shown one way in edit mode, shown another in review mode before commit. There are far more urgent problems than fixing my 61 year old diff format confusion, I don't think this justifies a bug report. TL;DR the merge process for FreeBSD-update and like, can be intensely confusing when you try to reconcile what it tells you about /etc/ -G On Sun, Nov 6, 2022 at 12:07 PM Tomoaki AOKI wrote: > > On Sat, 5 Nov 2022 20:12:04 -0700 > bob prohaska wrote: > > > On Mon, Oct 24, 2022 at 08:32:17PM -0700, Mark Millard wrote: > > > > > > Your /etc/rc.d/ldconfig script seems to have not been updated > > > by use of etcupdate or mergemaster or other such. (How much > > > else is also out of date? How much of what you have for /etc/ > > > and the like goes back to 2022-Jan-07 or before?) > > > > > > > Alas, that is too true. The system was set up on July 2, 2020 > > and I've never managed to make sense of either mergemaster nor > > etcupdate. Far as I could tell it didn't matter, the host ran > > correctly, until now. > > > > It's been transplanted to a new hard drive, which allows the > > installation of a ports tree. Ports don't install because of > > the stale /etc/rc.d/ldconfig file. > > > > Since no changes have been made to /etc/ apart from /etc/rc.conf > > is it possible to simply let mergemaster or etcupdate install > > the latest defaults? I have looked at the manpage for etcupdate > > and didn't recognize any straightforward way to simply accept > > all updates. This particular system is expendable, so I'd be > > glad to try things that might not work well, or at all. > > > > Apologies if I'm being dumb (probably guilty) or lazy (definitely > > guilty). The barrage of questions generated by etcupdate and > > mergemaster is simply overwhelming. And, I suspect, largely > > unnecessary. > > > > Thanks for reading! > > > > bob prohaska > > For a relatively casual way. > > If I'm facing the same situation, I will... > > 1. `mergemaster -UFiP` for now, then... > 2. `etcupdate extract -B` for next upgrade. > > And on next upgrade, `etcupdate -p` before installing upgrade, > and then `etcupdate -B` after install. > You can add -n for dry-run before actual etcupdate. > > > For some notes: > mergemaster, the old and less maintained tool, uses current installation > and updated tree. Old dedault state is not at all considered. > > So it could be used for already-updated states. > > etcupdate, the currently maintained tool, uses previous and updated > defaults, and current installation (working environment). > It compares differences between old and new default, check if the > differences can be sanely applicable to currently working environment > or not, and if it's sane, apply the diff automatically. > If any conflict happenes, ask the admin (this case, you) for actions. > > So it requires previous default state, thus cannot use for this case, > except you are sure what the actual previous revision was and can > prepare the source tree (possibly obj tree, too?) and somehow create > "current" tree ATM (will be turned over to "previous" tree on etcupdate > run). > > See manpages for detail. > > -- > Tomoaki AOKI >