From nobody Mon Jun 19 07:53:10 2023 X-Original-To: dev-commits-src-all@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 4Ql27W2HG9z4f0Fp; Mon, 19 Jun 2023 07:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ql27W13SNz4HN7; Mon, 19 Jun 2023 07:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687161191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+3s2SbmOm8E/ws+tRITDNGs1bzl5bD7RoMhYZueTJaU=; b=cpSi2MqKGMZE0CTgYxQx+jNIG5KRgZjlVOwS2FeGDBoReGouPr+DBffDMfUJcKQkt8ANbF mQ5chuSNjlcoH6zlW07oloS3CshRwgCHthVqMhgcStnTcxwJHPKxISim8zktLIOgG0hL0m xjvLYyhLIvCT8mvNTSb8jhblDPd41yi/5dTFT5HCmkR5oTGQ8P7C26O9d3w+yPZ3Xrk5X6 o79TgvcADQW/OT43hHn37OaAtnu0ND/aBSFQK1GDTbBE/Wk9Iqt+I7o2S5xtsZQExyNOpO C4MrGHnPRRcyJNyWRcGN9Xtc8SeQnFqcENQyMwZbboKdz35sLitg/57xHtDtbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687161191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+3s2SbmOm8E/ws+tRITDNGs1bzl5bD7RoMhYZueTJaU=; b=DEJaMiLytlKYHDUghqCIcr3x9MjKK3Z0GlxibiJrXc584kvHAzXfnNI5BTRHRypSizm3a8 GTHZnLKMRKV5oHWMz0BtvEl5EeJWXz3ibDm8bz8Bkcpzwed5oG1tm/U3JnZO2KpZODlvr0 D0nzOzHF57IygWleN8QarQ1JE5CiyiyRwkaXmfNKBi9nnkXYlNUEihptuD/92sbVQGPuKZ 4HhHSPWTJA4w7oe1irzbOI6ckP3pwMExoZJ280EEb8fZJYiN5sW4fCUpyp14CFRpFNM47e u6NKtKfyI0Nj6iWmadTfbhomTt4Dxxh5TWZV8V8QAQYmxm+66spcprHGCzZdrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687161191; a=rsa-sha256; cv=none; b=Rig0o4EQ73RFBg4HFQWlXBLkzazUjqewbuUMNvjzdugeumo0xx3A2kWUgKzcsQFRfUoahn WzMZtCJOo/t0bc6vloZwYVLTBv7zprZzhC4tzUrB8sh6cVNma74nRKzG3w16/5VvelZsrD Sn8BGsym3wXqHvwW6dF/hZigOde1Ubb3nHD80pYaewVNoeAIIixVHr1wNhUHjDlQNhfQRx 3u88YMHex3JJoC6tYIHpSf013tPH8AKPUunaMVLW6y0VgkbIyUYvjBiaEkoicyo4YV+wWo 0Pn+IvIrHkPs3QCVySO1UO5hFj34z28Sde+Aow1DkFRRICvg0U1jdDKFo0GUcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ql27W08Cbz18Q0; Mon, 19 Jun 2023 07:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35J7rAR4022700; Mon, 19 Jun 2023 07:53:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35J7rAZn022699; Mon, 19 Jun 2023 07:53:10 GMT (envelope-from git) Date: Mon, 19 Jun 2023 07:53:10 GMT Message-Id: <202306190753.35J7rAZn022699@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: 79a96e294c1a - main - motd: unbreak for source upgrade List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79a96e294c1acb4a2d17447a35f08647a6d09978 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=79a96e294c1acb4a2d17447a35f08647a6d09978 commit 79a96e294c1acb4a2d17447a35f08647a6d09978 Author: Eugene Grosbein AuthorDate: 2023-06-19 07:49:35 +0000 Commit: Eugene Grosbein CommitDate: 2023-06-19 07:49:35 +0000 motd: unbreak for source upgrade In case of source upgrade path from 12.x proper merge of new /etc installs /etc/motd.template. Becase of that, the system in left without symlink /etc/motd -> /var/run/motd but with stale /etc/motd contents. Fix it creating symlink despite of presence of /etc/motd.template. MFC after: 1 week --- libexec/rc/rc.d/motd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libexec/rc/rc.d/motd b/libexec/rc/rc.d/motd index e27cf273741d..da050882c367 100755 --- a/libexec/rc/rc.d/motd +++ b/libexec/rc/rc.d/motd @@ -38,10 +38,10 @@ motd_start() # Otherwise, create an empty template file. install -c -o root -g wheel -m ${PERMS} /dev/null "${TEMPLATE}" fi - # Provide compatibility symlink: - if [ ! -h "${COMPAT_MOTD}" ]; then - ln -sF "${TARGET}" "${COMPAT_MOTD}" - fi + fi + # Provide compatibility symlink: + if [ ! -h "${COMPAT_MOTD}" ]; then + ln -sF "${TARGET}" "${COMPAT_MOTD}" fi T=`mktemp -t motd`