From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 564AA158020 for ; Wed, 26 Oct 2022 17:32:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2D45E0972; Wed, 26 Oct 2022 17:32:03 +0000 (UTC) Received: from mail-yb1-f174.google.com (mail-yb1-f174.google.com [209.85.219.174]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AD813E095E for ; Wed, 26 Oct 2022 17:32:03 +0000 (UTC) Received: by mail-yb1-f174.google.com with SMTP id z192so5623544yba.0 for ; Wed, 26 Oct 2022 10:32:03 -0700 (PDT) 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=9yFKND3sll03KPfJ1zytFtnMZpurYwJ8F54rVzopYcc=; b=t6SkSdVeOolECClZHcyRPAvsuU6sBpYc3/uM/ly+vOPKP6keNZ6xSZFA+LERnW/E/K 06UyU4y5/7NL2uznjdgPFLN0sp1HzabmNI16rvzUwZnbkYS5YiVc7JlmEkATEtmVuVBo CG61niYbUVRjZn9JGUndBMopARw3bKNLjUaR3M7CwNAOpKwFEFWpqQw/EcWB/H9riETT GT57qSwxH3JD0SFbEC7RzAxZa/x8eD9oDn1p+aXPxc4cZ9o5Q0rMWMaCxujZ9g/95OMl 1maD2L2BK/1X4ETUA9Q/LUjSvGLjlnXXt4ecIChR7UU786JBpQYjGePkzrxHkuRyUdiF 2S6g== X-Gm-Message-State: ACrzQf2tkgSdL5VYv2YTxyAa0pxsk+Nj6K5FTcPIZHUGpDH8RJ3rEjhP 2JqNhJcLkiGpiu6tL9RZD0nlc6X4U9b9s5SMn5DgqVA76Do= X-Google-Smtp-Source: AMsMyM41KiyK5zU/byZgMxsMGU5cDZvm5Gr7gG7k1Ur41Dhix/YY0vzvZniB2yUZSQBAMyb+QznMsbZclCSgSAWHwfM= X-Received: by 2002:a25:3283:0:b0:6ca:5895:c7d1 with SMTP id y125-20020a253283000000b006ca5895c7d1mr30247554yby.297.1666805522782; Wed, 26 Oct 2022 10:32:02 -0700 (PDT) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-user@lists.gentoo.org Reply-to: gentoo-user@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 References: <7b461fc5-25fa-f07b-aedf-ea538c424bb5@spamtrap.tnetconsulting.net> <84d6e3ed-2bd8-720b-b158-eb2cd534fe39@spamtrap.tnetconsulting.net> <20221026181520.537b7104@digimed.co.uk> In-Reply-To: <20221026181520.537b7104@digimed.co.uk> From: Rich Freeman Date: Wed, 26 Oct 2022 13:31:52 -0400 Message-ID: Subject: Re: [gentoo-user] Update to /etc/sudoers disables wheel users!!! To: gentoo-user@lists.gentoo.org Content-Type: text/plain; charset="UTF-8" X-Archives-Salt: 59cab292-5140-41bf-8598-8c57859660b4 X-Archives-Hash: da93e21cf99b2c45a7128f81b31c22d0 On Wed, Oct 26, 2022 at 1:15 PM Neil Bothwick wrote: > > On Wed, 26 Oct 2022 10:21:06 -0600, Grant Taylor wrote: > > > > dispatch-conf even gives you the opportunity to edit it before > > > applying. > > > > Yep. > > > > I almost always reject the changes suggested on config files that I've > > modified and accept them on files that I've not modified. > > > > I really do wish that there was a better way to manage this, likely > > involving diffs / deltas. E.g. what changed between the N distribution > > file and the N+1 distribution file. Can that same change be safely > > applied to the N' distribution file to create the N'+1 file? > > conf-update allows you to merge the new and old files, prompting you to > pick which to use on each differing section, with a further option to > edit the lines. That way you can keep your changed lines but still add > lines relating to new config options. > It could really use an overhaul but cfg-update does 3-way diffs and auto-merges based on them. Ie, if in a block of text you make a change, and in a new update that particular block of text hasn't changed, then your previous change will get auto-merged. If the upstream file changed in that block of text then you can do a 3-way diff. The tool is really old and barely maintained (I'm caretaking it but don't really want to deal with that - patches welcome). It also uses RCS to store the change history for 3-way merging and that could probably be switched to git or something more modern. If you use an x11-based merge tool then it will also refuse to attempt an automatic merge if X11 isn't available. (Obviously you can't actually run the manual merge if the tool uses X11 and that isn't available.) Using it I find that maybe 95% of my config file changes involve no prompts. Another useful tool is etckeeper which is basically just some integrations for portage around maintaining /etc in git. You can of course just do that manually but it will auto-commit changes if you forget to do so before an update. -- Rich