diff options
Diffstat (limited to 'usr.sbin/etcupdate/tests/conflicts_test.sh')
| -rw-r--r-- | usr.sbin/etcupdate/tests/conflicts_test.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/etcupdate/tests/conflicts_test.sh b/usr.sbin/etcupdate/tests/conflicts_test.sh index 87857e7cd0a9..ea59ac7a8485 100644 --- a/usr.sbin/etcupdate/tests/conflicts_test.sh +++ b/usr.sbin/etcupdate/tests/conflicts_test.sh @@ -80,7 +80,7 @@ EOF cat > $NEW/etc/login.conf <<EOF default:\\ :passwd_format=md5:\\ - :copyright=/etc/COPYRIGHT + :welcome=/var/run/motd: EOF cat > $TEST/etc/login.conf <<EOF default:\\ @@ -234,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 @@ -247,13 +247,12 @@ echo "Checking 'r':" cat > $CONFLICTS/etc/login.conf <<EOF default:\\ :passwd_format=md5:\\ - :copyright=/etc/COPYRIGHT\\ :welcome=/etc/motd: 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 |