From owner-freebsd-current@freebsd.org Wed Nov 18 19:23:59 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 5D7D946FE62 for ; Wed, 18 Nov 2020 19:23:59 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x732.google.com (mail-qk1-x732.google.com [IPv6:2607:f8b0:4864:20::732]) (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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cbt5n6Kbtz4Xfm for ; Wed, 18 Nov 2020 19:23:57 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x732.google.com with SMTP id v143so2995573qkb.2 for ; Wed, 18 Nov 2020 11:23:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=nBnha86KnbtLkMJuwYeiyrcb6zyiwyN1ZxmP8KUVTxs=; b=bGbEO/nYtR02nK/i1tXsillOyeS7uaRcTkDaJ5w3ukABOI5wr+/XoYfclYK1wG5VtB 6MCaZ5bW/ZjL1ez8mXCGcxK1nAKDwfj0i2jDo4SaqJcDGQEnRfe0DuYxJsqNjqK+MqxK smM24gbyPvz2RLkAYPslm4DExDrGMTSTQotK3Gzajsx9Zkq42yNFnUN6FljgBXyiFGRn 8Sd2o1ynjjbrFEWnT6lt6cHKW8Tm17HPP6L7vj3C10XvpRlEYeZ4TTaW1+UyBDdoS71t XkDQqiCZDgQnP5m9aDyL0LYmawzckg4EJC8Z7KwCZ/ntYOX/W9UJnA5sHPa8HEstsKgj djQg== X-Gm-Message-State: AOAM530SqlGIhqO59tdaC8enyX2myawHmC2N8XjRejwEy+ZxwNcfYwb4 YlUNiUuSnOFt6PL7mnCc0raUKoDn1XjfYzcSSS7ixa7r01ghxPq5 X-Google-Smtp-Source: ABdhPJwERRQtT6gNHpxr9pgTjeti8E5skBzqezbV8wBDmSa1D8gHKZzH0MGPGjqNGYzIQGgVqqzsA9/I55bvKGk1RS0= X-Received: by 2002:a05:620a:228f:: with SMTP id o15mr6724129qkh.206.1605727436896; Wed, 18 Nov 2020 11:23:56 -0800 (PST) MIME-Version: 1.0 References: <20191125011135.GA69956@mail.bsd4all.net> <20191125.102736.1372422754370589145.yasu@utahime.org> <20200122.155654.980180717476039692.yasu@utahime.org> <20201118.201439.1502496832985621878.yasu@utahime.org> In-Reply-To: <20201118.201439.1502496832985621878.yasu@utahime.org> From: Warner Losh Date: Wed, 18 Nov 2020 12:23:45 -0700 Message-ID: Subject: Re: /etc/os-release isn't created To: Yasuhiro KIMURA Cc: FreeBSD Current X-Rspamd-Queue-Id: 4Cbt5n6Kbtz4Xfm X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.99 / 15.00]; ARC_NA(0.00)[]; MAILMAN_DEST(0.00)[freebsd-current]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::732:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::732:from]; NEURAL_HAM_SHORT(-0.99)[-0.993]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::732:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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 19:23:59 -0000 On Wed, Nov 18, 2020 at 4:16 AM Yasuhiro KIMURA wrote: > 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 > I did some light testing and it seemed to work for me, so I've gone ahead and committed it as r367810. Thanks for the reminder.