From nobody Sat Sep 09 16:02:37 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 4Rjd6S5623z4sydX for ; Sat, 9 Sep 2023 16:02:40 +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 4Rjd6S3pb7z4TV8; Sat, 9 Sep 2023 16:02:40 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694275360; 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=p1ITb4nE8HPK/XRSVMnhCIV5esYusbLwIZTiP0/lTcI=; b=GYpY4wqJMLAep7V4BoyCnpcdJp+ESXqe/HwqLVCpggL+/pVODMfYqIn+HrJmIqngQDIfwG k0qU2y1ej7kjzORrEW1ArvL+bxgswopWV61khnj35+rIefObQ91A3+RVlqAk7V+8o9uwNL m6Vnw/OGxmeHIdTPatRo9i/mNCnSE5b9rvM2rX4NCiX4nnKYABziFgjYYYEBAoiw58DsIY wuf+02MxhEjuJ2TC+ySGvs2CKDt8C3HWdGy47MWmj/YAClA7h0iT9azOIuYmx+XYtDUftI JD4k7onKm+Gxi2DL0ESmwvRJwHcfK3gncYRztGrEncg01uMtmGLAaoPIz9tZRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694275360; a=rsa-sha256; cv=none; b=tEuGsNU99/ct5+GGCgPqsgdzAqCQ3kt1Y0YTujJ/OMDUvd8pCKGzkgZtLIFkZDE11jJ1NI +zA9dfSiT4EgkFDYSRIJ93pyury5gXBf6bZbmAiD5/EEngDSJ9Y8KlaVVMDfASJ6jRIM4y 6lmXTLIsTMLFXP+loz5L0gCzISkz6UO6F7QmTMF/iayp9G2x7uDUz2ND1n7M0cM78PtV31 pVqkG2ILJ7rRtpprE8Rq4QamUh3PDUk2PQOZripJ/65+lVwGnmfuTy40/BwN9ZenIKxkJj pSQmUPACALp0rRrH5dqjNtTaTXXbk49EujDNCOcUrkV+wamKDZFU/OkWhPvUHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694275360; 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=p1ITb4nE8HPK/XRSVMnhCIV5esYusbLwIZTiP0/lTcI=; b=ufH42utLSHKeNE/OcfDMOq6GuD0ZWQryrsUleWV5oifzyY3k8I2x4G/j1pU2dwQTnHtr83 eKxtegsPlPrBIA8qXRPEf6/olzbgGChyWGdC9924Z6NFY3dXjbG3Lx/pighD7aD8s7du4g xJ3RiHBLgwD6XGBlj1EtQ0ys/r6LbsCCe4i3/tkxLAlgA30X4Lnn3tO970Dr3frxHcYdFA QIJTlpdi57n7YbSjdKr66koHTaskxU3EvGyM3x0DYolJ0AIxvSOIHePnXKd/GtlqkA/EqM Khr1AgDOV7JC5VEuXyly/VxxyiAIuKh1aSRtH5pPYctgAaOgcnkWm8MsheORfQ== Received: from [IPV6:2601:648:8683:a9e0:346e:8e34:11f3:aeb0] (unknown [IPv6:2601:648:8683:a9e0:346e:8e34:11f3:aeb0]) (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 did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Rjd6R6v0Pz18dc; Sat, 9 Sep 2023 16:02:39 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <865dc0ef-a19d-876c-b0a5-03b888b531f5@FreeBSD.org> Date: Sat, 9 Sep 2023 09:02:37 -0700 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.15; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 To: Dimitry Andric References: <5c5c3ea5-5b14-d969-f55f-b894e4983359@sonicboom.org> <46ee9e3b-adeb-4cd1-5fcc-43547c5c7231@gmail.com> <222e96ba-70b6-e976-8e32-d3726dde18b1@sonicboom.org> <7CDB341A-F9E1-4816-8443-E4C349A86C84@FreeBSD.org> Content-Language: en-US From: John Baldwin Subject: Re: user problems when upgrading to v15 Cc: "freebsd-current@freebsd.org" , brian whalen In-Reply-To: <7CDB341A-F9E1-4816-8443-E4C349A86C84@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 9/2/23 7:11 AM, Dimitry Andric wrote: > On 1 Sep 2023, at 03:42, brian whalen wrote: >> >> Repeating the entire process: >> >> I created a 13.2 vm with 6 cores and 8GB of ram. >> >> Ran freebsd-update fetch and install. >> >> Ran pkg install git bash ccache open-vm-tools-nox11 >> >> Used git clone to get current and ports source files. >> >> Edited /etc/make.conf to use ccache >> >> Ran make -j6 buildworld && make -j6 kernel >> >> I then rebooted in single user mode and did the next steps saving output to a file with > filename. >> >> etcupdate -p was pretty uneventful. It did show the below and did not prompt to edit. >> >> root@f15:~ # less etcupdatep >> C /etc/group >> C /etc/master.passwd > > This is a problem: the "C" characters mean there were conflicts, and it's indeed very unfortunate that etcupdate does not immediately force you to resolve them. Because now you basically have mangled group and master.passwd files, with conflict markers in them! No, the conflicted files are in /var/db/etcupdate/conflicts, the files in /etc are still the old ones at this point and won't be updated until you run 'etcupdate resolve' to fix them. I suspect what happened here is that Brian chose the 'tf' (theirs-full) option for 'etcupdate resolve' when he really wanted to do 'e' to edit the conflicted version. > Immediately after this, you should run "etcupdate resolve", and fix any conflicts that it has found. > > Note that recently there was a lot of churn due to the removal of $FreeBSD$ keywords, and this almost always creates conflicts in the group and passwd files. For lots of other files in /etc, the conflicts are resolved automatically, but unfortunately not for the files that are essential to log in! > > >> make installworld seemed mostly error free though I did see a nonzero status for a man page failed inn the man4 directory. >> >> etcupdate -B only showed the below. This was my first build after install. >> >> root@f15:~ # less etcupdateB >> Conflicts remain from previous update, aborting. > > Yes, that is indeed the problem. You must first resolve conflicts from any previous etcupdate run, before doing anything else. As to why it does not immediately forces you to do so, and delegates this to a separate step, which can easily be forgotten, I have no idea. So that if you are doing scripted upgrades, you don't hang forever in a script. The intention is that after doing a bunch of scripted installworld + etcupdate's on various hosts you can use 'etcupdate status' to see if there are any remaining steps requiring manual intervention. There could be an option to request batched vs interactivate updates perhaps. >> If I type exit in single user mode to go multi user mode, the local user still works. After a reboot the local user still works. This local user can also sudo as expected. This wasn't the case for the previous build when I first reported this. However, if I run etcupdate resolve it is still presenting /etc/group and /etc/master/passwd as problems. >> >> If this is is expected behavior for current then no big deal. I just wasn't sure. > > The conflicts themselves are expected, alas. But you _must_ resolve them, otherwise you can end up with a mostly-bricked system. No, the conflict markers are not placed in the versions in /etc. However, etucpdate does refuse to do a "new" upgrade until you resolve all the conflicts from your previous upgrade to ensure that conflicted upgrades aren't missed. -- John Baldwin