Re: install/54990: After upgrade from 9.0-RC2 to 9.0, the release candidate is still present

[Takeshi Nakayama <tn%catvmics.ne.jp@localhost>]

>>> Takeshi Nakayama <nakayama%NetBSD.org@localhost> wrote

> I think that it is necessary to change as follows.
> 
> Index: usr.sbin/postinstall/postinstall.in
> ===================================================================
> RCS file: /cvsroot/src/usr.sbin/postinstall/postinstall.in,v
> retrieving revision 1.14
> diff -u -d -r1.14 postinstall.in
> --- usr.sbin/postinstall/postinstall.in	30 Jan 2020 13:54:05 -0000	1.14
> +++ usr.sbin/postinstall/postinstall.in	21 Feb 2020 06:32:53 -0000
> @@ -1269,9 +1269,9 @@
>  {
>  	[ -n "$1" ] || err 3 "USAGE: do_motd  fix|check"
>  
> -	if ${GREP} -i 'http://www.NetBSD.org/Misc/send-pr.html' \
> +	if ${GREP} -i 'https*://www.NetBSD.org/Misc/send-pr.html' \
>  		"${DEST_DIR}/etc/motd" >/dev/null 2>&1 \
> -	    || ${GREP} -i 'http://www.NetBSD.org/support/send-pr.html' \
> +	    || ${GREP} -i 'https*://www.NetBSD.org/support/send-pr.html' \
>  		"${DEST_DIR}/etc/motd" >/dev/null 2>&1
>  	then
>  		tmp1="$(mktemp /tmp/postinstall.motd.XXXXXXXX)"
> 
> -- Takeshi Nakayama

Ah, old URL will not be https, so only this change is needed.

Index: usr.sbin/postinstall/postinstall.in
===================================================================
RCS file: /cvsroot/src/usr.sbin/postinstall/postinstall.in,v
retrieving revision 1.14
diff -u -d -r1.14 postinstall.in
--- usr.sbin/postinstall/postinstall.in	30 Jan 2020 13:54:05 -0000	1.14
+++ usr.sbin/postinstall/postinstall.in	21 Feb 2020 06:59:55 -0000
@@ -1271,7 +1271,7 @@
 
 	if ${GREP} -i 'http://www.NetBSD.org/Misc/send-pr.html' \
 		"${DEST_DIR}/etc/motd" >/dev/null 2>&1 \
-	    || ${GREP} -i 'http://www.NetBSD.org/support/send-pr.html' \
+	    || ${GREP} -i 'https*://www.NetBSD.org/support/send-pr.html' \
 		"${DEST_DIR}/etc/motd" >/dev/null 2>&1
 	then
 		tmp1="$(mktemp /tmp/postinstall.motd.XXXXXXXX)"

-- Takeshi Nakayama