From owner-freebsd-current@freebsd.org Wed Nov 18 11:15:47 2020 Return-Path: Delivered-To: freebsd-current@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3C3712EC3C3 for ; Wed, 18 Nov 2020 11:15:47 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from maybe.home.utahime.org (gate.home.utahime.org [183.180.29.210]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CbgGV0bJ2z3Gtl for ; Wed, 18 Nov 2020 11:15:45 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1]) (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 maybe.home.utahime.org (Postfix) with ESMTPS id 78ACE2D7DF for ; Wed, 18 Nov 2020 20:15:35 +0900 (JST) Received: from localhost (rolling.home.utahime.org [192.168.174.11]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by eastasia.home.utahime.org (Postfix) with ESMTPSA id A12E3476BA; Wed, 18 Nov 2020 20:15:32 +0900 (JST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.0 at eastasia.home.utahime.org Date: Wed, 18 Nov 2020 20:14:39 +0900 (JST) Message-Id: <20201118.201439.1502496832985621878.yasu@utahime.org> To: freebsd-current@freebsd.org Subject: Re: /etc/os-release isn't created From: Yasuhiro KIMURA In-Reply-To: <20200122.155654.980180717476039692.yasu@utahime.org> References: <20191125011135.GA69956@mail.bsd4all.net> <20191125.102736.1372422754370589145.yasu@utahime.org> <20200122.155654.980180717476039692.yasu@utahime.org> X-Mailer: Mew version 6.8 on Emacs 27.1 Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4CbgGV0bJ2z3Gtl X-Spamd-Bar: + X-Spamd-Result: default: False [1.30 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+a:spf-authorized.utahime.org]; TO_DN_NONE(0.00)[]; HFILTER_HELO_IP_A(1.00)[maybe.home.utahime.org]; HFILTER_HELO_NORES_A_OR_MX(0.30)[maybe.home.utahime.org]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[utahime.org:+]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[183.180.29.210:from]; ASN(0.00)[asn:2519, ipnet:183.180.0.0/16, country:JP]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[utahime.org:s=maybe2019112701]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[utahime.org]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[183.180.29.210:from:127.0.2.255]; NEURAL_SPAM_SHORT(1.00)[0.996]; MID_CONTAINS_FROM(1.00)[]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-current] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 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: Wed, 18 Nov 2020 11:15:47 -0000 Dear Committers, From: Yasuhiro KIMURA Subject: Re: /etc/os-release isn't created Date: Wed, 22 Jan 2020 15:56:54 +0900 (JST) > I created patch adding logic that handles symbolik link to mergemaster > and submitted it to following bug report. > > Bug 242212 usr.sbin/mergemaster/mergemaster.sh: There is no logic to handle symbolic > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=242212 > > So please review and/or test it. Would someone please commit it? As is explained currently mergemaster doesn't handle symbolic links. And it causes that /etc/os-release symbolink link isn't created when it doesn't exit before upgrade and you upgrade base system with steps described in /usr/src/Makefile. It happens such cases as following. * 13-CURRENT before r354922 -> 13-CURRENT r354922 or later * 12.1-RELEASE -> 12.2-RELEASE * 11.4-RELEASE -> 12.2-RELEASE Best Regards. --- Yasuhiro KIMURA