git: b0c2236f0390 - main - etcupdate: tests: Fix tests
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 12 Jan 2026 17:11:46 UTC
The branch main has been updated by jlduran:
URL: https://cgit.FreeBSD.org/src/commit/?id=b0c2236f0390ac4a04da2c4b9cd5ecd6bd80d53c
commit b0c2236f0390ac4a04da2c4b9cd5ecd6bd80d53c
Author: Jose Luis Duran <jlduran@FreeBSD.org>
AuthorDate: 2026-01-12 05:09:28 +0000
Commit: Jose Luis Duran <jlduran@FreeBSD.org>
CommitDate: 2026-01-12 17:10:48 +0000
etcupdate: tests: Fix tests
Fix test login.conf files and update their MD5 checksums.
PR: 291649
Reviewed by: imp
Fixes: 54ce6b2c4c16 ("login.conf.5: Remove mention of login copyright setting")
Pull Request: https://github.com/freebsd/freebsd-src/pull/1962
---
usr.sbin/etcupdate/tests/conflicts_test.sh | 5 +++--
usr.sbin/etcupdate/tests/tests_test.sh | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/usr.sbin/etcupdate/tests/conflicts_test.sh b/usr.sbin/etcupdate/tests/conflicts_test.sh
index a2ccabaa17ee..ea59ac7a8485 100644
--- a/usr.sbin/etcupdate/tests/conflicts_test.sh
+++ b/usr.sbin/etcupdate/tests/conflicts_test.sh
@@ -80,6 +80,7 @@ EOF
cat > $NEW/etc/login.conf <<EOF
default:\\
:passwd_format=md5:\\
+ :welcome=/var/run/motd:
EOF
cat > $TEST/etc/login.conf <<EOF
default:\\
@@ -233,7 +234,7 @@ build_login_conflict
echo "Checking 'tf':"
echo 'tf' | $COMMAND resolve -d $WORKDIR -D $TEST >/dev/null
-file /etc/login.conf "" 7774a0f9a3a372c7c109c32fd31c4b6b
+file /etc/login.conf "" b139b1ab44a6933659246ac4401fcbe4
file /etc/login.conf.db
resolved /etc/login.conf
@@ -251,7 +252,7 @@ EOF
echo 'r' | $COMMAND resolve -d $WORKDIR -D $TEST >/dev/null
-file /etc/login.conf "" 966e25984b9b63da8eaac8479dcb0d4d
+file /etc/login.conf "" 95de92ea3f1bb1bf4f612a8b5908cddd
file /etc/login.conf.db
resolved /etc/login.conf
diff --git a/usr.sbin/etcupdate/tests/tests_test.sh b/usr.sbin/etcupdate/tests/tests_test.sh
index 71c78869e89e..37ad901e5b9d 100644
--- a/usr.sbin/etcupdate/tests/tests_test.sh
+++ b/usr.sbin/etcupdate/tests/tests_test.sh
@@ -596,6 +596,7 @@ EOF
cat > $NEW/etc/login.conf <<EOF
default:\\
:passwd_format=md5:\\
+ :welcome=/var/run/motd:
EOF
cp $OLD/etc/login.conf $TEST/etc/login.conf
@@ -921,7 +922,7 @@ check_trees()
file /etc/passwd
file /etc/pwd.db
file /etc/spwd.db
- file /etc/login.conf "" 7774a0f9a3a372c7c109c32fd31c4b6b
+ file /etc/login.conf "" b139b1ab44a6933659246ac4401fcbe4
file /etc/login.conf.db
file /etc/mail/aliases "" 7d598f89ec040ab56af54011bdb83337
file /etc/services "" 37fb6a8d1273f3b78329d431f21d9c7d