From nobody Mon Jun 26 04:27:48 2023 X-Original-To: dev-commits-src-branches@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 4QqFFJ62mPz4j9RB; Mon, 26 Jun 2023 04:27:48 +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 4QqFFJ5ZbWz3pNV; Mon, 26 Jun 2023 04:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687753668; 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=67E5yxPQFLTbr2sKQAA01ka6+w0tgVYeOejpq8G5yiM=; b=Cj88uBV9yt+JLcjkegvU2uZHkXFgEIcJBQMYJtBMDJ72YB8sMD0uMNJXEqDYkE+i4LM/xd FOrTphv5qyYhgckSCax6FNvtbdO6Qg91AYcFTvDWNbMc2RYDxwZhjvuqXQfMwYYt/tKbd9 eHygb6ssCwYRz7Y+nGlaeWLlpqaY2dVlqLf1LXG+YJZRFBCUwhlw2gD62vLBVFQyqFx48z WwTDADykA30/KgPAFGLIgXSuuWkJI0zgG+cqwYQo5Y8YIXWMIp4alnUbJDyN11veUDX3Qx lFSGk1zaHykMSwkt2JVQb64JZOzrWELjnI37IM7m+Euon1bdcN2JRWnHiVE76w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687753668; 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=67E5yxPQFLTbr2sKQAA01ka6+w0tgVYeOejpq8G5yiM=; b=A/UDWSq/7bk9tyYbDi3a8QrZU6+wnhIsCdUrsXIDoMXX91RijayEZWQnIvRBUZbjw60W8b 4Am0WKbsp0sgOiazLF39g/Bpogi2Nh2rL7R0wbKaRMVzVXWzPDUlkWXLQmmBf6OniP5UhP F8RtsmY7KBQYqdN7gp2iObdTHX5H0nu4f/qsebhwyl2Y3B1Ism5pJfHFDbw0S5Giq23G93 G9acxpyXkikO7yWJ2fo8lDyy4mqhCSRvwcLJFZtX01TqkgAYifWxY4hJzW0KnTnxJXKlNR /lyUOtIJs5KsO26IX+1LJXCaFWojWHd4xVj69KEdPYfLWjE3jj86mZduLDXN6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687753668; a=rsa-sha256; cv=none; b=WOYI/u9e3V/a5YKHR+BW/ttILAS0aISB5n6prSrq0aaVhcuUp4pBpfFH5KRp3rPWH9bsGe gZPGSAXfSVR1AlLr6W0tVYA7qGMca58qiOJJjhB28LI4bTV5IHQ4w5+4R8TN6ZyeVq+tvu GYBKQzqJqGrXymkUsjiLaT7pytDpaFqxvJw8Pl7KkY7EAzmYXv5WLgdsUj0fn9C3H9lfdv PTXUwxUczFk5uSJHDnAl9y7kdl/iVeXsKNSa6OWnaQoHmbA2TJnc0wXIDJFI50RHRAxk2Z 5rQGjcrmxnYLSfv8AjAz30twNhJo06SF9RxJtm7MVaRk9QeMnWECdDPP9/2Rbw== 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 4QqFFJ4fJ5zvkq; Mon, 26 Jun 2023 04:27:48 +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 35Q4Rmob021115; Mon, 26 Jun 2023 04:27:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35Q4Rm7q021114; Mon, 26 Jun 2023 04:27:48 GMT (envelope-from git) Date: Mon, 26 Jun 2023 04:27:48 GMT Message-Id: <202306260427.35Q4Rm7q021114@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 428647d483bb - stable/13 - motd: MFC: unbreak for source upgrade List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 428647d483bb78ca8f152e5c4ef7556eec2a2c68 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=428647d483bb78ca8f152e5c4ef7556eec2a2c68 commit 428647d483bb78ca8f152e5c4ef7556eec2a2c68 Author: Eugene Grosbein AuthorDate: 2023-06-19 07:49:35 +0000 Commit: Eugene Grosbein CommitDate: 2023-06-26 04:26:47 +0000 motd: MFC: 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 is 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. (cherry picked from commit 79a96e294c1acb4a2d17447a35f08647a6d09978) --- 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 d9dd60a0f59a..7d865a00a88f 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`