From owner-freebsd-current@freebsd.org Thu May 16 13:51:51 2019 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ACC8E1597613 for ; Thu, 16 May 2019 13:51:51 +0000 (UTC) (envelope-from brd@so14k.com) Received: from mailman.ysv.freebsd.org (mailman.ysv.freebsd.org [IPv6:2001:1900:2254:206a::50:5]) by mx1.freebsd.org (Postfix) with ESMTP id 26ED87770A for ; Thu, 16 May 2019 13:51:51 +0000 (UTC) (envelope-from brd@so14k.com) Received: by mailman.ysv.freebsd.org (Postfix) id DAE441597612; Thu, 16 May 2019 13:51:50 +0000 (UTC) Delivered-To: current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B80F61597611 for ; Thu, 16 May 2019 13:51:50 +0000 (UTC) (envelope-from brd@so14k.com) Received: from wout2-smtp.messagingengine.com (wout2-smtp.messagingengine.com [64.147.123.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 54D3C77708 for ; Thu, 16 May 2019 13:51:50 +0000 (UTC) (envelope-from brd@so14k.com) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 48A5E393; Thu, 16 May 2019 09:51:48 -0400 (EDT) Received: from imap2 ([10.202.2.52]) by compute2.internal (MEProxy); Thu, 16 May 2019 09:51:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=so14k.com; h= mime-version:message-id:in-reply-to:references:date:from:to :subject:content-type; s=fm2; bh=xBbriTGLd5tfpssjqjIU5BC9U5BfvZE ibHf+IAWif7M=; b=Xe3mVAEr0YvYmjmdi2AtIlxpqEOFsKyWexLL+IKx5q/AZUc y+mheOyY5aTsm+nt5V510rf9yVg9G7GL5KWofYH1erWVTp/jiOqI5jwBIaBe2DeW /FluA6rdLycqNmXLiewbPWKI0IudGk7wdRYhG/ztDyIazmiMYZLK/wQYTMBXU6re oBIQ0uZ/yoGlkVEKMECPxVraAHYCFTZLG+V7ZehznA/0kY+X3bh9oTc9xkGHER+r +mCpiRgZGh/RuVzfbWOYVqxEW2mVZjupKkxH7aHnk0GeogRhGH0SKRT2OYH8VwGg 6Ym5xIANi3BRzDQc180tMRuUZ2Odm57l2uMT9Uw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=xBbriT GLd5tfpssjqjIU5BC9U5BfvZEibHf+IAWif7M=; b=0HLA2t3BbU3VmrAM/IL8ZE 5XrhCwRoPm2quXo9W1Na1BwpYpU7vtB2jL5Br72yqACadetaqtsLV7wuWQoB6xqo FRh+VWIe+biJ8aKkC9leXGe6Y9zM/9YRRtYrvUcyWDiXs/se7al18InRQe4Vk+90 nyLhbfW7RAti0pvXekgrAIL2N4NtR+OjrAYe99AE2X5FseXrvoSPKkkR38QNeXzG IzBi456fnc+i4gIcMCaovdij8rXliodAh1flM5PtzUpX2zQECqCekfgn3qIaOA8j x/B/oK+aezzBuCurdQjUgnd+DZ9HnorIh7bxDHB46vlIBNrQNBAa1JhIBVIHjF4Q == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddruddttddgieekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepofgfggfkjghffffhvffutgesthdtredtreertdenucfhrhhomhepfdeurhgr ugcuffgrvhhishdfuceosghrugesshhoudegkhdrtghomheqnecurfgrrhgrmhepmhgrih hlfhhrohhmpegsrhgusehsohdugehkrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 3C3C57C3E9; Thu, 16 May 2019 09:51:47 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.1.6-549-ge400f56-fmstable-20190516v3 Mime-Version: 1.0 Message-Id: <0e39d38c-f9b8-4303-9a10-54785a20cb8d@www.fastmail.com> In-Reply-To: <20190516113352.GT1330@albert.catwhisker.org> References: <20190516113352.GT1330@albert.catwhisker.org> Date: Thu, 16 May 2019 09:51:34 -0400 From: "Brad Davis" To: "David Wolfskill" , current@freebsd.org Subject: Re: r347638 breaks mergemaster Content-Type: text/plain X-Rspamd-Queue-Id: 54D3C77708 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.99)[-0.993,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-Mailman-Approved-At: Thu, 16 May 2019 14:21:28 +0000 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 May 2019 13:51:51 -0000 On Thu, May 16, 2019, at 7:34 AM, David Wolfskill wrote: > Today's daily update of head is from r347606 to r347682. > > src/UPDATING (still) cites: > > ... > To rebuild everything and install it on the current system. > ----------------------------------------------------------- > # Note: sometimes if you are running current you gotta do more than > # is listed here if you are upgrading from a really old current. > > > make buildworld > make buildkernel KERNCONF=YOUR_KERNEL_HERE > make installkernel KERNCONF=YOUR_KERNEL_HERE > [1] > [3] > mergemaster -Fp [5] > make installworld > mergemaster -Fi [4] > make delete-old [6] > > .... > > But rr347638 moved master.passwd from src/etc to lib/libc/gen, so > mergemaster ... isn't happy: > > | *** Creating the temporary root environment in /var/tmp/temproot > | *** /var/tmp/temproot ready for use > | *** Creating and populating directory structure in /var/tmp/temproot > | > | cp: /usr/src/etc/master.passwd: No such file or directory > | > | *** FATAL ERROR: Cannot copy files to the temproot environment > > I don't know if etcupdate is similarly affected. Looking at this. Thanks for reporting. Regards, Brad Davis