The branch main has been updated by eugen:
URL:
https://cgit.FreeBSD.org/src/commit/?id=79a96e294c1acb4a2d17447a35f08647a6d09978
commit 79a96e294c1acb4a2d17447a35f08647a6d09978
Author: Eugene Grosbein <eu...@freebsd.org>
AuthorDate: 2023-06-19 07:49:35 +0000
Commit: Eugene Grosbein <eu...@freebsd.org>
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`
