Date: Mon, 22 May 2023 23:06:53 -0700 From: Enji Cooper <yaneurabeya@gmail.com> To: Jamie Landeg-Jones <jamie@catflap.org> Cc: freebsd-current@freebsd.org Subject: Re: MOTD is not created correctly (since 2022/02/18) Message-ID: <ABCDAF66-5326-4FF2-9501-7DFE683E30A9@gmail.com> In-Reply-To: <1FA0E3FF-9DF6-46BA-81C1-4DCE5542CAD5@gmail.com> References: <202305230318.34N3IOaX056503@donotpassgo.dyslexicfish.net> <1FA0E3FF-9DF6-46BA-81C1-4DCE5542CAD5@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_9248556B-B6EB-43DF-997E-D359F5765F66 Content-Type: multipart/alternative; boundary="Apple-Mail=_2552AE10-6A8D-4B1A-8C25-3D92120C927E" --Apple-Mail=_2552AE10-6A8D-4B1A-8C25-3D92120C927E Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On May 22, 2023, at 11:06 PM, Enji Cooper <yaneurabeya@gmail.com> = wrote: >=20 >>=20 >> On May 22, 2023, at 8:18 PM, Jamie Landeg-Jones <jamie@catflap.org> = wrote: >>=20 >> I've just finally updated to 13-stable, and can't be the first to = notice this?! >>=20 >> /etc/rc.d/motd contains the line: >>=20 >> uname -v | sed -e 's,^\([^#]*\) #\(.* = [1-2][0-9][0-9][0-9]\).*/\([^\]*\) $,\1 (\3) #\2,' >>=20 >> Note the space before the "$" - needed because the uname -v output = used >> to have a trailing space. This was fixed and comitted on 2022/02/18: >>=20 >> = https://cgit.freebsd.org/src/commit/usr.bin/uname/uname.c?id=3D7e05fa3b449= 007adaa6e588ebb3b8d76f30b355c >>=20 >> Since then, the sed doesn't match, so the uname(1) output is = unchanged. >>=20 >> There's no point altering the sed to work with both posibilities, so = can >> someone commit the fix of removing the ' ' before the '$' in = /etc/rc.d/motd ? >=20 > Hi Jamie, > Thank you for the note =E2=80=94 could you please file a PR and = reference it in a reply? Ah, never mind. I see that it=E2=80=99s been fixed recently on main. -Enji --Apple-Mail=_2552AE10-6A8D-4B1A-8C25-3D92120C927E Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8 <html><head><meta http-equiv=3D"Content-Type" content=3D"text/html; = charset=3Dutf-8"></head><body style=3D"word-wrap: break-word; = -webkit-nbsp-mode: space; line-break: after-white-space;" class=3D""><br = class=3D""><div><br class=3D""><blockquote type=3D"cite" class=3D""><div = class=3D"">On May 22, 2023, at 11:06 PM, Enji Cooper <<a = href=3D"mailto:yaneurabeya@gmail.com" = class=3D"">yaneurabeya@gmail.com</a>> wrote:</div><br = class=3D"Apple-interchange-newline"><div class=3D""><meta = charset=3D"UTF-8" class=3D""><blockquote type=3D"cite" = style=3D"font-family: Helvetica; font-size: 12px; font-style: normal; = font-variant-caps: normal; font-weight: 400; letter-spacing: normal; = orphans: auto; text-align: start; text-indent: 0px; text-transform: = none; white-space: normal; widows: auto; word-spacing: 0px; = -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; = text-decoration: none;" class=3D""><br = class=3D"Apple-interchange-newline">On May 22, 2023, at 8:18 PM, Jamie = Landeg-Jones <<a href=3D"mailto:jamie@catflap.org" = class=3D"">jamie@catflap.org</a>> wrote:<br class=3D""><br = class=3D"">I've just finally updated to 13-stable, and can't be the = first to notice this?!<br class=3D""><br class=3D"">/etc/rc.d/motd = contains the line:<br class=3D""><br class=3D"">uname -v | sed -e = 's,^\([^#]*\) #\(.* [1-2][0-9][0-9][0-9]\).*/\([^\]*\) $,\1 (\3) = #\2,'<br class=3D""><br class=3D"">Note the space before the "$" - = needed because the uname -v output used<br class=3D"">to have a trailing = space. This was fixed and comitted on 2022/02/18:<br class=3D""><br = class=3D""><a = href=3D"https://cgit.freebsd.org/src/commit/usr.bin/uname/uname.c?id=3D7e0= 5fa3b449007adaa6e588ebb3b8d76f30b355c" = class=3D"">https://cgit.freebsd.org/src/commit/usr.bin/uname/uname.c?id=3D= 7e05fa3b449007adaa6e588ebb3b8d76f30b355c</a><br class=3D""><br = class=3D"">Since then, the sed doesn't match, so the uname(1) output is = unchanged.<br class=3D""><br class=3D"">There's no point altering the = sed to work with both posibilities, so can<br class=3D"">someone commit = the fix of removing the ' ' before the '$' in /etc/rc.d/motd ?<br = class=3D""></blockquote><br style=3D"caret-color: rgb(0, 0, 0); = font-family: Helvetica; font-size: 12px; font-style: normal; = font-variant-caps: normal; font-weight: 400; letter-spacing: normal; = text-align: start; text-indent: 0px; text-transform: none; white-space: = normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; = text-decoration: none;" class=3D""><span style=3D"caret-color: rgb(0, 0, = 0); font-family: Helvetica; font-size: 12px; font-style: normal; = font-variant-caps: normal; font-weight: 400; letter-spacing: normal; = text-align: start; text-indent: 0px; text-transform: none; white-space: = normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; = text-decoration: none; float: none; display: inline !important;" = class=3D"">Hi Jamie,</span><br style=3D"caret-color: rgb(0, 0, 0); = font-family: Helvetica; font-size: 12px; font-style: normal; = font-variant-caps: normal; font-weight: 400; letter-spacing: normal; = text-align: start; text-indent: 0px; text-transform: none; white-space: = normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; = text-decoration: none;" class=3D""><span class=3D"Apple-tab-span" = style=3D"caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: = 12px; font-style: normal; font-variant-caps: normal; font-weight: 400; = letter-spacing: normal; text-align: start; text-indent: 0px; = text-transform: none; white-space: pre; word-spacing: 0px; = -webkit-text-stroke-width: 0px; text-decoration: none;"> = </span><span style=3D"caret-color: rgb(0, 0, 0); font-family: Helvetica; = font-size: 12px; font-style: normal; font-variant-caps: normal; = font-weight: 400; letter-spacing: normal; text-align: start; = text-indent: 0px; text-transform: none; white-space: normal; = word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: = none; float: none; display: inline !important;" class=3D"">Thank you for = the note =E2=80=94 could you please file a PR and reference it in a = reply?</span><br class=3D""></div></blockquote><br = class=3D""></div><div>Ah, never mind. I see that it=E2=80=99s been fixed = recently on main.</div><div>-Enji</div></body></html>= --Apple-Mail=_2552AE10-6A8D-4B1A-8C25-3D92120C927E-- --Apple-Mail=_9248556B-B6EB-43DF-997E-D359F5765F66 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEtvtxN6kOllEF3nmX5JFNMZeDGN4FAmRsV/0ACgkQ5JFNMZeD GN4o2xAAiQNac3RUOM/JYASafen9TgXRhS6JmTPYL3EdQrUiaMcRk/l5TQos5PYq mOcJsw05XTviPrSgL6z/44SGbYcsvv5QM8qB2P5mpHqVOV1eT16Jxyo6sha+QGlP oF5p1cRblJsfFX55Iml8uIBlmCpzmAt7OSXaEHfQLfhaNDiN4YSXoSSO5DQLzCoT 4b7BwRP2AQqWDnJTdbqcMnsQWMvO3ZjVj2wgnj9Fl955BiwZaTtCQpoqxelBALTa dhk5Mn4DOwWplqz8ADZxH5Kd1UpgQLb1AoNBvxFdoTUKVc9kZV9S90YMPpxJL3i9 sr99n8DrVzk7t9PB3GJQVwvRWlEy562w60SYZmCq0wRqscsJxiur5vNBNT0vZsM0 Q9QYjEiidTUQlYnpoowRH11TNbu70nzlsoUXAfxmCG/TI8YjtlRnBt1EVt2Q+4wu XofpAeN2cmmY5c7Zwm1rZT75kRot+to3XzB/TNQjtijCZuxHKRmyp0VVLazGDr3C W0YlcQ92jYx73Z8EqmRgF7jeF+GjHNui2z391kPj9RJrTvp70MGhY+jwB4ATCxNO zKiUsXG9FeLnUbWOwFvbrS9OdwzM7514EARV5pz6Xq1VOU6J4rMrpfBy8v26w/uV /YrZ/bVwbDh2MK+/2/gOLt+EYxHhh5kgXYUdGJJz2mbGWt1PMGw= =ELQ+ -----END PGP SIGNATURE----- --Apple-Mail=_9248556B-B6EB-43DF-997E-D359F5765F66--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ABCDAF66-5326-4FF2-9501-7DFE683E30A9>