From nobody Wed Dec 08 17:05:17 2021 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 17DAA18D2EC9; Wed, 8 Dec 2021 17:05:20 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J8Np76jJLz4jW6; Wed, 8 Dec 2021 17:05:19 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from [10.0.1.4] (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 2EA3435B85; Wed, 8 Dec 2021 17:05:19 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <2e894793-f860-3415-1f5d-26fd5e85a69d@FreeBSD.org> Date: Wed, 8 Dec 2021 09:05:17 -0800 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 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:91.0) Gecko/20100101 Thunderbird/91.3.2 Subject: Re: Make etcupdate bootstrap requirement due to previous mergemaster usage more clear in handbook Content-Language: en-US To: Miroslav Lachman <000.fbsd@quip.cz>, Yetoo Happy , freebsd-doc@freebsd.org Cc: freebsd-current@freebsd.org References: <56a60a9b-3d7f-b29e-6074-71078f4b0fe6@quip.cz> From: John Baldwin In-Reply-To: <56a60a9b-3d7f-b29e-6074-71078f4b0fe6@quip.cz> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638983119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=evVsH5Nf24EYoYTE5prKH4P856yHlXYFDxcv9rCdnPo=; b=Z2UAfGHo5sK7xhmQsCrgtMHYuqkKEhodGnWqJbYRe92vgO4yzHJarNg49s58sU/Y2b0YAQ Mx/FPxeAKU9R3f2IkH2R03yz8qDP1dZhtEJmLeNMnl4RXEQ12GeAInKESpLm0fV3D43A3B /9tOrSWyHMD6LvjF/15L6/uiY8LxrPFYPwtEe7Ch+MkmL6C3ju/Ft9kPfNwNqw/j30NPh2 wC3nQ4fh21/lD5nre0vJb6XlXaedkQe9GBcrRaTvxx8IZr/mQzNVoSlHqkjw/rVEhbrmsD eGstgNTHJGG3reReHT+vMf5ClgbtrZ7jQcH02A7VAF5rIA043UP5NqRELHExAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638983119; a=rsa-sha256; cv=none; b=yobUelE01q8CWXleAxj8GExjS9NWNI5gmogAOgAmrNfmNvpf8x9sko81dcHW/f5+FieT8O sc5BXrrLsBeDk7m7SNcSYzu3hyz2ARtr8ucQ32Qz9Ia3o+cHc6iwQcBfc3A8XTVAq9lvX+ am6OO/9rEuWceP/ehf1S+Qt3+0FiQQg3OBhoaTasxbzjaXCV1jbgH4R2cjSkuk+8xOSM6z 8nPoq0rlvuEnD7yMX8/aS0BLja8Ne1jdYRBz6LcpeT1M57jCQIUkZ6cN1FBPvulWZmqnVN k58+QxF8+Clx6KlUjU71c7ygVbHOWGZ4suqSWgQS0RKpISXzh1X5bagGNk3kKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 12/3/21 4:58 AM, Miroslav Lachman wrote: > So beside the update of documentation I really would like to see some > changes to etcupdate workflow where files are modified in temporary > location and moved to destination only if they do not contain any syntax > breaking changes like <<<<, ====, >>>>. This is what etcupdate does, so I'm a bit confused why you are getting merge markers in /etc. When an automated 3-way merge doesn't work due to conflicts, the file with the conflicts is saved in /var/db/etcupdate/conflicts/. It is only copied to /etc when you mark it as fully resolved when running 'etcupdate resolve'. Perhaps you had multiple conflicts in a modified file and when editing the file you only fixed the first one and then marked it as resolved at the prompt? Even in that case etcupdate explicitly prompts you a second time after you say "r" with "File still has conflicts, are you sure?", so it will only install a file to /etc with those changes if you have explicitly confirmed you want it. -- John Baldwin