git: cf2c79915a63 - main - organization.dot: Update core.13 members and secretary
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=cf2c79915a63463ce6f7323127ade110bbe67db6 commit cf2c79915a63463ce6f7323127ade110bbe67db6 Author: Li-Wen Hsu AuthorDate: 2024-07-03 19:41:35 + Commit: Li-Wen Hsu CommitDate: 2024-07-03 19:42:29 + organization.dot: Update core.13 members and secretary Approved by:core --- share/misc/organization.dot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/misc/organization.dot b/share/misc/organization.dot index f33ea0f0dbd0..1a88bc71b14e 100644 --- a/share/misc/organization.dot +++ b/share/misc/organization.dot @@ -24,8 +24,8 @@ _misc [label="Miscellaneous Hats"] # Development teams go here alphabetically sorted by FreeBSD login name -core [label="Core Team\nc...@freebsd.org\nbapt, bcr, emaste,\ngrog, jhb, lwhsu,\nmanu, tcberner, 0mp"] -coresecretary [label="Core Team Secretary\ncore-secret...@freebsd.org\ncarlavilla"] +core [label="Core Team\nc...@freebsd.org\nallanjude, dch, glebius,\nhrs, lwhsu, mat,\nolivier, tcberner"] +coresecretary [label="Core Team Secretary\ncore-secret...@freebsd.org\nrene"] doccommitters [label="Doc/www Committers\ndoc-committ...@freebsd.org"] doceng [label="Documentation Engineering Team\ndoc...@freebsd.org\nbcr, gabor, gjb, hrs,\nblackend, ryusuke, wblock"] pkgmgr [label="Package Management Team\npkg...@freebsd.org\nantoine, bdrewery"]
git: 21e98f6d195a - main - BSD.tests.dist: Add entry for mixer tests
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=21e98f6d195a5db63b17025f339684048834e1aa commit 21e98f6d195a5db63b17025f339684048834e1aa Author: Li-Wen Hsu AuthorDate: 2024-07-27 18:44:28 + Commit: Li-Wen Hsu CommitDate: 2024-07-27 18:44:28 + BSD.tests.dist: Add entry for mixer tests Fixes: 94a86f3f6920 mixer(8): Add tests Sponsored by: The FreeBSD Foundation --- etc/mtree/BSD.tests.dist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index bd9edc786f17..5c724e5a8e5b 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1241,6 +1241,8 @@ .. makefs .. +mixer +.. newsyslog .. nmtree
git: 6ea4d95f6c76 - main - Move support of Realtek 8156/8156B from cdce(4) to ure(4)
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=6ea4d95f6c76aa64d2db5c04c87e68dc299544df
commit 6ea4d95f6c76aa64d2db5c04c87e68dc299544df
Author: Li-Wen Hsu
AuthorDate: 2024-08-12 04:04:05 +
Commit: Li-Wen Hsu
CommitDate: 2024-08-12 06:56:28 +
Move support of Realtek 8156/8156B from cdce(4) to ure(4)
Reviewed by:kevlo, imp, hrs
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D45088
---
share/man/man4/cdce.4 | 6 +-
share/man/man4/ure.4 | 9 +++--
sys/dev/usb/net/if_cdce.c | 1 -
sys/dev/usb/net/if_ure.c | 2 +-
sys/dev/usb/quirk/usb_quirk.c | 1 -
5 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/share/man/man4/cdce.4 b/share/man/man4/cdce.4
index 6768c7bbf517..9d842e475d85 100644
--- a/share/man/man4/cdce.4
+++ b/share/man/man4/cdce.4
@@ -27,7 +27,7 @@
.\"
.\" $NetBSD: cdce.4,v 1.4 2004/12/08 18:35:56 peter Exp $
.\"
-.Dd February 10, 2023
+.Dd May 3, 2024
.Dt CDCE 4
.Os
.Sh NAME
@@ -107,10 +107,6 @@ Sharp Zaurus PDA
.It
Terayon TJ-715 DOCSIS Cable Modem
.It
-Realtek RTL8156 USB GBE/2.5G Ethernet Family Controller
-.It
-Planex USB-LAN2500R
-.It
Huawei 3G/4G LTE (eg. E3372, E5573) and other mobile network devices
.El
.Sh DIAGNOSTICS
diff --git a/share/man/man4/ure.4 b/share/man/man4/ure.4
index 18b68ec9bc8a..942764109dd8 100644
--- a/share/man/man4/ure.4
+++ b/share/man/man4/ure.4
@@ -23,12 +23,12 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd October 31, 2016
+.Dd May 3, 2024
.Dt URE 4
.Os
.Sh NAME
.Nm ure
-.Nd "RealTek RTL8152/RTL8153 USB to Ethernet controller driver"
+.Nd "RealTek RTL8152/RTL8153/RTL8153B/RTL8156/RTL8156B USB to Ethernet
controller driver"
.Sh SYNOPSIS
To compile this driver into the kernel,
place the following lines in your
@@ -90,6 +90,11 @@ Set 1000baseTX operation over twisted pair.
The RealTek gigE chips support 1000Mbps in
.Cm full-duplex
mode only.
+.It Cm 2500base-T
+Set 2500Base-T operation over twisted pair.
+The RealTek 8156/8156B chips support 2500Mbps in
+.Cm full-duplex
+mode only.
.El
.Pp
The
diff --git a/sys/dev/usb/net/if_cdce.c b/sys/dev/usb/net/if_cdce.c
index d53d861cfb00..cbb6ae76ef0c 100644
--- a/sys/dev/usb/net/if_cdce.c
+++ b/sys/dev/usb/net/if_cdce.c
@@ -281,7 +281,6 @@ static const STRUCT_USB_HOST_ID cdce_host_devs[] = {
{USB_VPI(USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLA300, CDCE_FLAG_ZAURUS |
CDCE_FLAG_NO_UNION)},
{USB_VPI(USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC700, CDCE_FLAG_ZAURUS |
CDCE_FLAG_NO_UNION)},
{USB_VPI(USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC750, CDCE_FLAG_ZAURUS |
CDCE_FLAG_NO_UNION)},
- {USB_VPI(USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8156, 0)},
{USB_VENDOR(USB_VENDOR_HUAWEI), USB_IFACE_CLASS(UICLASS_VENDOR),
USB_IFACE_SUBCLASS(0x02), USB_IFACE_PROTOCOL(0x16),
diff --git a/sys/dev/usb/net/if_ure.c b/sys/dev/usb/net/if_ure.c
index e9112f403ef5..3f72adb21aea 100644
--- a/sys/dev/usb/net/if_ure.c
+++ b/sys/dev/usb/net/if_ure.c
@@ -478,7 +478,7 @@ done:
}
/*
- * Probe for a RTL8152/RTL8153 chip.
+ * Probe for a RTL8152/RTL8153/RTL8156 chip.
*/
static int
ure_probe(device_t dev)
diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c
index 11be1215062e..d6ddeafd7195 100644
--- a/sys/dev/usb/quirk/usb_quirk.c
+++ b/sys/dev/usb/quirk/usb_quirk.c
@@ -111,7 +111,6 @@ static struct usb_quirk_entry
usb_quirks[USB_DEV_QUIRKS_MAX] = {
USB_QUIRK(ELSA, MODEM1, UQ_CFG_INDEX_1),
USB_QUIRK(PLANEX2, MZKUE150N, UQ_CFG_INDEX_1),
USB_QUIRK(CISCOLINKSYS, USB3GIGV1, UQ_CFG_INDEX_1),
- USB_QUIRK(REALTEK, RTL8156, UQ_CFG_INDEX_2),
/* Quirks for printer devices */
USB_QUIRK(HP, 895C, UQ_BROKEN_BIDIR),
USB_QUIRK(HP, 880C, UQ_BROKEN_BIDIR),
git: d3b05d0ea10a - main - Add smbus and i2c device IDs for Meteor Lake
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=d3b05d0ea10abe059dc63c6fb6ef3f061b758af2
commit d3b05d0ea10abe059dc63c6fb6ef3f061b758af2
Author: SHENG-YI HONG
AuthorDate: 2024-08-13 12:22:43 +
Commit: Li-Wen Hsu
CommitDate: 2024-08-13 12:52:19 +
Add smbus and i2c device IDs for Meteor Lake
Reviewed by:emaste, Daniel Schaefer
MFC after: 3 days
Sponsored by: Framework Computer Inc
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D46249
---
sys/dev/ichiic/ig4_pci.c| 8
sys/dev/ichsmb/ichsmb_pci.c | 9 +
2 files changed, 17 insertions(+)
diff --git a/sys/dev/ichiic/ig4_pci.c b/sys/dev/ichiic/ig4_pci.c
index 9f12e713cdeb..138de77c35db 100644
--- a/sys/dev/ichiic/ig4_pci.c
+++ b/sys/dev/ichiic/ig4_pci.c
@@ -168,6 +168,10 @@ static int ig4iic_pci_detach(device_t dev);
#define PCI_CHIP_ALDERLAKE_M_I2C_3 0x54eb8086
#define PCI_CHIP_ALDERLAKE_M_I2C_4 0x54c58086
#define PCI_CHIP_ALDERLAKE_M_I2C_5 0x54c68086
+#define PCI_CHIP_METEORLAKE_M_I2C_00x7e788086
+#define PCI_CHIP_METEORLAKE_M_I2C_10x7e798086
+#define PCI_CHIP_METEORLAKE_M_I2C_20x7e508086
+#define PCI_CHIP_METEORLAKE_M_I2C_30x7e518086
struct ig4iic_pci_device {
uint32_tdevid;
@@ -280,6 +284,10 @@ static struct ig4iic_pci_device ig4iic_pci_devices[] = {
{ PCI_CHIP_ALDERLAKE_M_I2C_3, "Intel Alder Lake-M I2C Controller-3",
IG4_TIGERLAKE},
{ PCI_CHIP_ALDERLAKE_M_I2C_4, "Intel Alder Lake-M I2C Controller-4",
IG4_TIGERLAKE},
{ PCI_CHIP_ALDERLAKE_M_I2C_5, "Intel Alder Lake-M I2C Controller-5",
IG4_TIGERLAKE},
+ { PCI_CHIP_METEORLAKE_M_I2C_0, "Intel Meteor Lake-M I2C Controller-0",
IG4_TIGERLAKE},
+ { PCI_CHIP_METEORLAKE_M_I2C_1, "Intel Meteor Lake-M I2C Controller-1",
IG4_TIGERLAKE},
+ { PCI_CHIP_METEORLAKE_M_I2C_2, "Intel Meteor Lake-M I2C Controller-2",
IG4_TIGERLAKE},
+ { PCI_CHIP_METEORLAKE_M_I2C_3, "Intel Meteor Lake-M I2C Controller-3",
IG4_TIGERLAKE},
};
static int
diff --git a/sys/dev/ichsmb/ichsmb_pci.c b/sys/dev/ichsmb/ichsmb_pci.c
index 675a15daaf1b..728bb942d503 100644
--- a/sys/dev/ichsmb/ichsmb_pci.c
+++ b/sys/dev/ichsmb/ichsmb_pci.c
@@ -113,6 +113,9 @@
#defineID_ALDERLAKE0x7aa3
#defineID_ALDERLAKE2 0x51a3
#defineID_ALDERLAKE3 0x54a3
+#defineID_METEORLAKE 0x7e22
+#defineID_METEORLAKE2 0x7f23
+#defineID_METEORLAKE3 0xae22
static const struct pci_device_table ichsmb_devices[] = {
{ PCI_DEV(PCI_VENDOR_INTEL, ID_82801AA),
@@ -215,6 +218,12 @@ static const struct pci_device_table ichsmb_devices[] = {
PCI_DESCR("Intel Alder Lake SMBus controller") },
{ PCI_DEV(PCI_VENDOR_INTEL, ID_ALDERLAKE3),
PCI_DESCR("Intel Alder Lake SMBus controller") },
+ { PCI_DEV(PCI_VENDOR_INTEL, ID_METEORLAKE),
+ PCI_DESCR("Intel Meteor Lake SMBus controller") },
+ { PCI_DEV(PCI_VENDOR_INTEL, ID_METEORLAKE2),
+ PCI_DESCR("Intel Meteor Lake SMBus controller") },
+ { PCI_DEV(PCI_VENDOR_INTEL, ID_METEORLAKE3),
+ PCI_DESCR("Intel Meteor Lake SMBus controller") },
};
/* Internal functions */
git: 213eb102aeec - main - msun: Fix typo in comment
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=213eb102aeec50b8c236aac1d8f0e0a3f9a99449
commit 213eb102aeec50b8c236aac1d8f0e0a3f9a99449
Author: Steve Kargl
AuthorDate: 2024-08-21 06:59:07 +
Commit: Li-Wen Hsu
CommitDate: 2024-08-21 06:59:07 +
msun: Fix typo in comment
PR: 280965
MFC after: 3 days
---
lib/msun/src/math_private.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h
index f3f7985ab7b6..1595f902846c 100644
--- a/lib/msun/src/math_private.h
+++ b/lib/msun/src/math_private.h
@@ -405,7 +405,7 @@ do {
\
* any extra precision into the type of 'a' -- 'a' should have type float_t,
* double_t or long double. b's type should be no larger than 'a's type.
* Callers should use these types with scopes as large as possible, to
- * reduce their own extra-precision and efficiciency problems. In
+ * reduce their own extra-precision and efficiency problems. In
* particular, they shouldn't convert back and forth just to call here.
*/
#ifdef DEBUG
git: abdc7bb79635 - main - bhyve(8): Remove mention of -A flag, again
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=abdc7bb79635d1d680053bb2bc73128e15cbb14a commit abdc7bb79635d1d680053bb2bc73128e15cbb14a Author: Li-Wen Hsu AuthorDate: 2024-08-23 11:57:09 + Commit: Li-Wen Hsu CommitDate: 2024-08-23 11:57:09 + bhyve(8): Remove mention of -A flag, again Follow 107584716cdeaa36c718a42861df1cb4b8b87e62 to remove the mention of -A flag added in b30a7e5418be5c5d27ac967f5ce99461ab79c37c . Sponsored by: The FreeBSD Foundation --- usr.sbin/bhyve/bhyve.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 527ccf720540..8001b5276d51 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -1166,7 +1166,7 @@ for a virtual machine, use .Fl o .Ar config.dump=1 : .Bd -literal -offset indent -/usr/sbin/bhyve -c 2 -m 256 -A -H -P \\ +/usr/sbin/bhyve -c 2 -m 256 -H -P \\ -s 0:0,hostbridge -s 1:0,virtio-net,tap0 \\ -s 2:0,ahci-hd,./vm0.img \\ -s 31,lpc -l com1,stdio \\
git: 73974a78f7f6 - main - hostname(1): Add test cases
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=73974a78f7f60acdbb26cdd5325c21c0bb1d2d4d
commit 73974a78f7f60acdbb26cdd5325c21c0bb1d2d4d
Author: Lin Lee
AuthorDate: 2024-01-17 04:30:29 +
Commit: Li-Wen Hsu
CommitDate: 2024-01-30 03:26:57 +
hostname(1): Add test cases
Sponsored by: The FreeBSD Foundation
Pull Request: https://github.com/freebsd/freebsd-src/pull/1069
---
bin/hostname/Makefile | 4 ++
bin/hostname/tests/Makefile | 6 +++
bin/hostname/tests/hostname_test.sh | 87 +
etc/mtree/BSD.tests.dist| 2 +
4 files changed, 99 insertions(+)
diff --git a/bin/hostname/Makefile b/bin/hostname/Makefile
index 683611b17299..14628b7850d4 100644
--- a/bin/hostname/Makefile
+++ b/bin/hostname/Makefile
@@ -1,5 +1,9 @@
+.include
PACKAGE=runtime
PROG= hostname
+HAS_TESTS=
+SUBDIR.${MK_TESTS}=tests
+
.include
diff --git a/bin/hostname/tests/Makefile b/bin/hostname/tests/Makefile
new file mode 100644
index ..87295101392f
--- /dev/null
+++ b/bin/hostname/tests/Makefile
@@ -0,0 +1,6 @@
+PACKAGE= tests
+
+ATF_TESTS_SH= hostname_test
+BINDIR=${TESTSDIR}
+
+.include
diff --git a/bin/hostname/tests/hostname_test.sh
b/bin/hostname/tests/hostname_test.sh
new file mode 100644
index ..57517821f7f1
--- /dev/null
+++ b/bin/hostname/tests/hostname_test.sh
@@ -0,0 +1,87 @@
+#-
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2024 Lin Lee
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+#
+# These tests need to run in a multibyte locale with non-localized
+# error messages.
+#
+export LC_CTYPE=C.UTF-8
+export LC_MESSAGES=C
+
+test_jail_name="test-hostname-jail"
+
+test_jail_conf='%%test_jail_name%% {
+host.hostname = "test-hostname.example.org";
+path = "/";
+persist;
+}'
+
+init()
+{
+echo "${test_jail_conf}" | \
+ sed -e "s/%%test_jail_name%%/${test_jail_name}/" > "./jail.conf"
+jail -f "./jail.conf" -c ${test_jail_name}
+}
+
+recycle()
+{
+jail -f "./jail.conf" -r ${test_jail_name}
+rm "./jail.conf"
+}
+
+atf_test_case basic cleanup
+basic_head()
+{
+atf_set require.user root
+atf_set "descr" "basic test for getting hostname"
+}
+basic_body()
+{
+init
+
+result=$(jexec ${test_jail_name} "hostname")
+atf_check_equal "test-hostname.example.org" "${result}"
+
+result=$(jexec ${test_jail_name} "hostname" -s)
+atf_check_equal "test-hostname" "${result}"
+
+result=$(jexec ${test_jail_name} "hostname" -d)
+atf_check_equal "example.org" "${result}"
+
+jexec ${test_jail_name} "hostname" "test-bsd2"
+result=$(jexec ${test_jail_name} "hostname")
+atf_check_equal "test-bsd2" "${result}"
+}
+basic_cleanup()
+{
+recycle
+}
+
+atf_init_test_cases()
+{
+atf_add_test_case basic
+}
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 660883ed848a..2f7d74cb58f8 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -33,6 +33,8 @@
..
expr
..
+hostname
+..
ln
..
ls
git: 63007e46110d - main - release: Add AZURE to CLOUDWARE
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=63007e46110d7f7a1f9d48fbac99f8a5bc166456 commit 63007e46110d7f7a1f9d48fbac99f8a5bc166456 Author: Li-Wen Hsu AuthorDate: 2024-02-08 05:49:01 + Commit: Li-Wen Hsu CommitDate: 2024-02-08 05:49:01 + release: Add AZURE to CLOUDWARE Let Azure use the image directly built by the release engineering team. Reviewed by:emaste Approved by:cperciva (re) MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41906 --- release/Makefile.vm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index cab46bb737b3..b9c43e8b491f 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -17,7 +17,8 @@ VMDK_DESC=VMWare, VirtualBox disk image QCOW2_DESC=Qemu, KVM disk image RAW_DESC= Unformatted raw disk image -CLOUDWARE_TYPES?= BASIC-CI \ +CLOUDWARE_TYPES?= AZURE \ + BASIC-CI \ EC2 \ GCE \ OCI \
git: 2e8ad2b69849 - main - sysctl(8): Fix typo in comment
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=2e8ad2b698498a1c380d0d6fc5792b2c56926801 commit 2e8ad2b698498a1c380d0d6fc5792b2c56926801 Author: Hao-Yu Hou AuthorDate: 2023-12-30 09:36:11 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 04:28:55 + sysctl(8): Fix typo in comment Line214: combind -> combine Reviewed by:zlai Event: Advanced UNIX Programming Course (Fall’23) at NTHU Request:https://github.com/freebsd/freebsd-src/pull/966 --- sbin/sysctl/sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index c37c1f3f7400..9e81f4480e40 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -211,7 +211,7 @@ main(int argc, char **argv) argc -= optind; argv += optind; - /* Nflag is name only and doesn't make sense to combind with these */ + /* Nflag is name only and doesn't make sense to combine with these */ /* TODO: few other combinations do not make sense but come back later */ if (Nflag && (lflag || nflag)) usage();
git: e9866ce84f41 - main - ping(8): Fix typo in ping6.c
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=e9866ce84f41bf8a5122713b027d1af05cbbb5b3
commit e9866ce84f41bf8a5122713b027d1af05cbbb5b3
Author: Hao-Yu Hou
AuthorDate: 2023-12-30 09:59:27 +
Commit: Li-Wen Hsu
CommitDate: 2024-02-13 04:29:07 +
ping(8): Fix typo in ping6.c
Line 703 & 863: kerel -> kernel
Line 2110: resposne -> response
Event: Advanced UNIX Programming Course (Fall’23) at NTHU.
Pull Request: https://github.com/freebsd/freebsd-src/pull/967
---
sbin/ping/ping6.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sbin/ping/ping6.c b/sbin/ping/ping6.c
index 99de4f608d69..356f0f72a6f8 100644
--- a/sbin/ping/ping6.c
+++ b/sbin/ping/ping6.c
@@ -700,7 +700,7 @@ ping6(int argc, char *argv[])
}
/*
-* let the kerel pass extension headers of incoming packets,
+* let the kernel pass extension headers of incoming packets,
* for privileged socket options
*/
if ((options & F_VERBOSE) != 0) {
@@ -860,7 +860,7 @@ ping6(int argc, char *argv[])
}
#endif /*ICMP6_FILTER*/
- /* let the kerel pass extension headers of incoming packets */
+ /* let the kernel pass extension headers of incoming packets */
if ((options & F_VERBOSE) != 0) {
int opton = 1;
@@ -2107,7 +2107,7 @@ pr_nodeaddr(struct icmp6_nodeinfo *ni, int nilen)
/*
* In icmp-name-lookups 05 and later, TTL of each returned address
-* is contained in the resposne. We try to detect the version
+* is contained in the response. We try to detect the version
* by the length of the data, but note that the detection algorithm
* is incomplete. We assume the latest draft by default.
*/
git: 26e69f9f98bf - main - dump(8): Fix typo in comment
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=26e69f9f98bf976b0f898f1fcb9ca572a0f22c54 commit 26e69f9f98bf976b0f898f1fcb9ca572a0f22c54 Author: yue0211 AuthorDate: 2023-12-30 13:17:09 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 04:30:30 + dump(8): Fix typo in comment Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/968 --- sbin/dump/dump.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h index 9429704a1800..a776c8209d0b 100644 --- a/sbin/dump/dump.h +++ b/sbin/dump/dump.h @@ -97,7 +97,7 @@ void quit(const char *fmt, ...) __printflike(1, 2); void timeest(void); time_t unctime(char *str); -/* mapping rouintes */ +/* mapping routines */ union dinode; intmapfiles(ino_t maxino, long *tapesize); intmapdirs(ino_t maxino, long *tapesize);
git: 664812f73488 - main - Fix grammar error in test/sys/file/closefrom_test.c
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=664812f73488c4c0e16982c5c97d639deb9d2431
commit 664812f73488c4c0e16982c5c97d639deb9d2431
Author: Yen-Cheng Chang
AuthorDate: 2024-01-01 06:38:02 +
Commit: Li-Wen Hsu
CommitDate: 2024-02-13 04:33:06 +
Fix grammar error in test/sys/file/closefrom_test.c
Event: Advanced UNIX Programming Course (Fall’23) at NTHU.
Pull Request: https://github.com/freebsd/freebsd-src/pull/973
---
tests/sys/file/closefrom_test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/sys/file/closefrom_test.c b/tests/sys/file/closefrom_test.c
index 7c6787bfd5f2..e30c5eb3d591 100644
--- a/tests/sys/file/closefrom_test.c
+++ b/tests/sys/file/closefrom_test.c
@@ -146,7 +146,7 @@ main(void)
printf("1..21\n");
- /* We better start up with fd's 0, 1, and 2 open. */
+ /* We'd better start up with fd's 0, 1, and 2 open. */
start = devnull();
if (start == -1)
fail("open", "bad descriptor %d", start);
git: ee40f9e860a1 - main - Fix typo in share/examples/sound/ossinit.h
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=ee40f9e860a10649575a0c80eb92dcfec7e353db commit ee40f9e860a10649575a0c80eb92dcfec7e353db Author: YuZhong-Chen AuthorDate: 2024-01-01 08:25:52 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 04:36:05 + Fix typo in share/examples/sound/ossinit.h Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/974 --- share/examples/sound/ossinit.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/examples/sound/ossinit.h b/share/examples/sound/ossinit.h index 5fd614ecb4fb..83920712286d 100644 --- a/share/examples/sound/ossinit.h +++ b/share/examples/sound/ossinit.h @@ -227,7 +227,7 @@ oss_init(config_t *config) * If desired frag is smaller than minimum, based on number of channels * and format (size in bits: 8, 16, 24, 32), set that as frag. Buffer size * is 2^frag, but the real size of the buffer will be read when the - * configuration of the device is successfull + * configuration of the device is successful */ int min_frag = size2frag(config->sample_size * config->channels);
git: edc7b46ebebb - main - Fix typo in share/examples/sunrpc/dir/rls.c
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=edc7b46ebebb064da44ca88c6afeeb9639b6fcd3
commit edc7b46ebebb064da44ca88c6afeeb9639b6fcd3
Author: YuZhong-Chen
AuthorDate: 2024-01-01 09:20:01 +
Commit: Li-Wen Hsu
CommitDate: 2024-02-13 04:36:58 +
Fix typo in share/examples/sunrpc/dir/rls.c
Event: Advanced UNIX Programming Course (Fall’23) at NTHU.
Pull Request: https://github.com/freebsd/freebsd-src/pull/974
---
share/examples/sunrpc/dir/rls.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/share/examples/sunrpc/dir/rls.c b/share/examples/sunrpc/dir/rls.c
index c165bba08e04..5c39b7139e14 100644
--- a/share/examples/sunrpc/dir/rls.c
+++ b/share/examples/sunrpc/dir/rls.c
@@ -71,7 +71,7 @@ main(argc, argv)
}
/*
-* Successfuly got a directory listing.
+* Successfully got a directory listing.
* Print it out.
*/
for (nl = result->readdir_res_u.list; nl != NULL; nl = nl->next) {
git: 8b6876e13672 - main - chio(8): Fix typo in the copyright section
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=8b6876e13672e418a6a9f47d1e62378311bd8ef0 commit 8b6876e13672e418a6a9f47d1e62378311bd8ef0 Author: Wilbert Allen Koeswoyo Suwito AuthorDate: 2024-01-02 13:21:07 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 04:38:27 + chio(8): Fix typo in the copyright section Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/978 --- bin/chio/chio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/chio/chio.c b/bin/chio/chio.c index 4feafe5ce720..07def55ee88f 100644 --- a/bin/chio/chio.c +++ b/bin/chio/chio.c @@ -32,7 +32,7 @@ */ /* * Additional Copyright (c) 1997, by Matthew Jacob, for NASA/Ames Research Ctr. - * Addidional Copyright (c) 2000, by C. Stephen Gunn, Waterspout Communications + * Additional Copyright (c) 2000, by C. Stephen Gunn, Waterspout Communications */ #include
git: 84886bf93ae9 - main - ed(1): Grammar fixes
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=84886bf93ae96ee4d19cd7f31696ba368cabddae commit 84886bf93ae96ee4d19cd7f31696ba368cabddae Author: Wilbert Allen Koeswoyo Suwito AuthorDate: 2024-01-03 06:15:46 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 04:42:54 + ed(1): Grammar fixes - Adding a missing verb "is" on line 723 - Changing is to are on line 835 Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/986 --- bin/ed/ed.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/ed/ed.1 b/bin/ed/ed.1 index b680f69eb706..0db9f8d76bb8 100644 --- a/bin/ed/ed.1 +++ b/bin/ed/ed.1 @@ -720,7 +720,7 @@ with By default, only the first match in each line is replaced. If the .Em g -(global) suffix is given, then every match to be replaced. +(global) suffix is given, then every match is to be replaced. The .Em n suffix, where @@ -832,7 +832,7 @@ Write the addressed lines to .Ar file . Any previous contents of .Ar file -is lost without warning. +are lost without warning. If there is no default filename, then the default filename is set to .Ar file , otherwise it is unchanged.
git: f4e0aec989f9 - main - ypldap(8): Fix grammar in ypldap.c
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=f4e0aec989f990a2792c829966e4af07f7880d81 commit f4e0aec989f990a2792c829966e4af07f7880d81 Author: Shi-Xin Huang AuthorDate: 2024-01-04 04:23:09 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 06:11:07 + ypldap(8): Fix grammar in ypldap.c Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/991 --- usr.sbin/ypldap/ypldap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ypldap/ypldap.c b/usr.sbin/ypldap/ypldap.c index ff1965dd6e2c..01b5955aa822 100644 --- a/usr.sbin/ypldap/ypldap.c +++ b/usr.sbin/ypldap/ypldap.c @@ -142,7 +142,7 @@ main_start_update(struct env *env) /* * XXX: Currently this function should only be called when updating is - * finished. A notification should be send to ldapclient that it should stop + * finished. A notification should be sent to ldapclient that it should stop * sending new pwd/grp entries before it can be called from different places. */ void
git: 3cddabf0bd5f - main - sh(1): Grammar fix in jobs.c
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=3cddabf0bd5fa9532fe2a1653b7b30f0ffe40401
commit 3cddabf0bd5fa9532fe2a1653b7b30f0ffe40401
Author: Fu-Cheng Wang
AuthorDate: 2024-01-04 06:15:09 +
Commit: Li-Wen Hsu
CommitDate: 2024-02-13 06:13:08 +
sh(1): Grammar fix in jobs.c
Event: Advanced UNIX Programming Course (Fall’23) at NTHU.
Pull Request: https://github.com/freebsd/freebsd-src/pull/992
---
bin/sh/jobs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c
index 90b5892f72b7..1328ae50edef 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -93,7 +93,7 @@ struct job {
short nprocs; /* number of processes */
pid_t pgrp; /* process group of this job */
char state; /* true if job is finished */
- char used; /* true if this entry is in used */
+ char used; /* true if this entry is in use */
char changed; /* true if status has changed */
char foreground;/* true if running in the foreground */
char remembered;/* true if $! referenced */
git: 0789c3bd2c45 - main - share/examples/sound: Fix spelling "controller"
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=0789c3bd2c4597e40b1d2556d21bfd10ff628a0a
commit 0789c3bd2c4597e40b1d2556d21bfd10ff628a0a
Author: Assume-Zhan
AuthorDate: 2024-01-05 04:13:58 +
Commit: Li-Wen Hsu
CommitDate: 2024-02-13 06:18:04 +
share/examples/sound: Fix spelling "controller"
Event: Advanced UNIX Programming Course (Fall’23) at NTHU.
Pull Request: https://github.com/freebsd/freebsd-src/pull/994
---
share/examples/sound/midi.c| 4 ++--
share/examples/sound/ossmidi.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/share/examples/sound/midi.c b/share/examples/sound/midi.c
index 7149bcb31c82..6d6ac9aa0fcd 100644
--- a/share/examples/sound/midi.c
+++ b/share/examples/sound/midi.c
@@ -49,7 +49,7 @@ main()
switch (event.type) {
case NOTE_ON:
case NOTE_OFF:
- case CONTROLER_ON:
+ case CONTROLLER_ON:
if ((l = read(midi_config.fd, &(event.note),
sizeof(event.note))) == -1) {
perror("Error reading MIDI note");
exit(1);
@@ -65,7 +65,7 @@ main()
case NOTE_OFF:
printf("Channel %d, note %d, velocity %d\n",
event.channel, event.note, event.velocity);
break;
- case CONTROLER_ON:
+ case CONTROLLER_ON:
printf("Channel %d, controller %d, value %d\n",
event.channel, event.controller, event.value);
break;
default:
diff --git a/share/examples/sound/ossmidi.h b/share/examples/sound/ossmidi.h
index 60bf5e41173e..99a6bacffe73 100644
--- a/share/examples/sound/ossmidi.h
+++ b/share/examples/sound/ossmidi.h
@@ -33,7 +33,7 @@
#define NOTE_ON 0x90
#define NOTE_OFF 0x80
#define CHANNEL_MASK 0xF
-#define CONTROLER_ON 0xB0
+#define CONTROLLER_ON 0xB0
typedef struct midi_event {
unsigned char type;
git: eb8ba6fb74f2 - main - rpc: Fix typo in comment
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=eb8ba6fb74f2d957bd5df357ae73f66a6002014a commit eb8ba6fb74f2d957bd5df357ae73f66a6002014a Author: Assume-Zhan AuthorDate: 2024-01-05 04:51:50 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 06:20:45 + rpc: Fix typo in comment Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/995 --- lib/libc/rpc/svc_vc.c | 2 +- sys/rpc/svc_vc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/rpc/svc_vc.c b/lib/libc/rpc/svc_vc.c index a4f45ba4aca9..e5826fdb6543 100644 --- a/lib/libc/rpc/svc_vc.c +++ b/lib/libc/rpc/svc_vc.c @@ -34,7 +34,7 @@ * svc_vc.c, Server side for Connection Oriented based RPC. * * Actually implements two flavors of transporter - - * a tcp rendezvouser (a listner and connection establisher) + * a tcp rendezvouser (a listener and connection establisher) * and a record/tcp stream. */ diff --git a/sys/rpc/svc_vc.c b/sys/rpc/svc_vc.c index 531bedb6b65a..8e7ff888eaa2 100644 --- a/sys/rpc/svc_vc.c +++ b/sys/rpc/svc_vc.c @@ -35,7 +35,7 @@ * svc_vc.c, Server side for Connection Oriented based RPC. * * Actually implements two flavors of transporter - - * a tcp rendezvouser (a listner and connection establisher) + * a tcp rendezvouser (a listener and connection establisher) * and a record/tcp stream. */
git: 69f9c5a51346 - main - nvmecontrol(8): Fix typo in ns.c
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=69f9c5a51346b1ada4854cb4131e8a63b7dd8b46 commit 69f9c5a51346b1ada4854cb4131e8a63b7dd8b46 Author: Yu-Sheng Ma AuthorDate: 2024-01-05 08:11:48 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 07:06:22 + nvmecontrol(8): Fix typo in ns.c `Insufficient` was spelled wrongly on line 537. Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/997 --- sbin/nvmecontrol/ns.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/nvmecontrol/ns.c b/sbin/nvmecontrol/ns.c index 62923056bd4e..1f1cd6101e35 100644 --- a/sbin/nvmecontrol/ns.c +++ b/sbin/nvmecontrol/ns.c @@ -531,7 +531,7 @@ nscontrollers(const struct cmd *f, int argc, char *argv[]) /* * NS MGMT Command specific status values: * 0xa = Invalid Format - * 0x15 = Namespace Insuffience capacity + * 0x15 = Namespace Insufficient capacity * 0x16 = Namespace ID unavailable (number namespaces exceeded) * 0xb = Thin Provisioning Not supported */
git: c9213e4bb924 - main - restore(8): Fix typo in restore.h
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c9213e4bb924cf3e664e8b624c1affc137114ebf
commit c9213e4bb924cf3e664e8b624c1affc137114ebf
Author: Yu-Sheng Ma
AuthorDate: 2024-01-05 08:42:50 +
Commit: Li-Wen Hsu
CommitDate: 2024-02-13 07:07:35 +
restore(8): Fix typo in restore.h
`operation` was spelled wrongly on line 60.
`dumped` was spelled wrongly on line 74.
Event: Advanced UNIX Programming Course (Fall'23) at NTHU.
Pull Request: https://github.com/freebsd/freebsd-src/pull/998
---
sbin/restore/restore.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sbin/restore/restore.h b/sbin/restore/restore.h
index e54555f39dd8..407816993196 100644
--- a/sbin/restore/restore.h
+++ b/sbin/restore/restore.h
@@ -57,7 +57,7 @@ extern long volno; /* current volume being read */
extern longntrec; /* number of TP_BSIZE records per tape block */
extern time_t dumptime; /* time that this dump begins */
extern time_t dumpdate; /* time that this dump was made */
-extern charcommand;/* opration being performed */
+extern charcommand;/* operation being performed */
extern FILE*terminal; /* file descriptor for the terminal input */
extern int Bcvt; /* need byte swapping on inodes and dirs */
extern int oldinofmt; /* reading tape with FreeBSD 1 format inodes */
@@ -71,7 +71,7 @@ struct entry {
chare_type; /* type of this entry, see below */
short e_flags;/* status flags, see below */
ino_t e_ino; /* inode number in previous file sys */
- longe_index;/* unique index (for dumpped table) */
+ longe_index;/* unique index (for dumped table) */
struct entry *e_parent;/* pointer to parent directory (..) */
struct entry *e_sibling; /* next element in this directory (.) */
struct entry *e_links; /* hard links to this inode */
git: 94d9c5f3bebc - main - ipf(8): Fix typo
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=94d9c5f3bebc1104325a1181f4231ccfef87adf0 commit 94d9c5f3bebc1104325a1181f4231ccfef87adf0 Author: Shin-Yi Zheng AuthorDate: 2024-01-05 14:02:31 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 07:14:27 + ipf(8): Fix typo Event: Advanced UNIX Programming Course (Fall’23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1002 --- sbin/ipf/ipf/ipf.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ipf/ipf/ipf.8 b/sbin/ipf/ipf/ipf.8 index b999f04e5d03..1c45b017e117 100644 --- a/sbin/ipf/ipf/ipf.8 +++ b/sbin/ipf/ipf/ipf.8 @@ -48,7 +48,7 @@ supports \fBlanguage\fI. At present, the only target language supported is \fBC\fB (-cc) for which two files - \fBip_rules.c\fP and \fBip_rules.h\fP are generated in the \fBCURRENT DIRECTORY\fP when \fBipf\fP is being run. These files can be used with the -\fBIPFILTER_COMPILED\fP kernel option to build filter rules staticlly into +\fBIPFILTER_COMPILED\fP kernel option to build filter rules statically into the kernel. .TP .B \-d
git: 711a74e19ffd - main - pax(1): Grammar fix in file_subs.c
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=711a74e19ffd7bcd116744a333c5c22835c17307 commit 711a74e19ffd7bcd116744a333c5c22835c17307 Author: HUNG-CHI CHANG AuthorDate: 2024-01-07 07:50:25 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 07:09:32 + pax(1): Grammar fix in file_subs.c Event: Advanced UNIX Programming Course (Fall’23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/999 --- bin/pax/file_subs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c index 7c68e643f04c..7214de337ec4 100644 --- a/bin/pax/file_subs.c +++ b/bin/pax/file_subs.c @@ -716,7 +716,7 @@ set_pmode(char *fnm, mode_t mode) * block boundaries significantly reduces the overhead when copying files * that are NOT very sparse. This overhead (when compared to a write) is * almost below the measurement resolution on many systems. Without it, - * files with holes cannot be safely copied. It does has a side effect as + * files with holes cannot be safely copied. It does have a side effect as * it can put holes into files that did not have them before, but that is * not a problem since the file contents are unchanged (in fact it saves * file space). (Except on paging files for diskless clients. But since we
git: dcde2454bc52 - main - Grammar fix in share/doc/IPv6/IMPLEMENTATION
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=dcde2454bc52f5d959a4e65692350773044d88c6 commit dcde2454bc52f5d959a4e65692350773044d88c6 Author: Ho-Kun Lin AuthorDate: 2024-01-05 17:56:26 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 07:16:01 + Grammar fix in share/doc/IPv6/IMPLEMENTATION Event: Advanced UNIX Programming Course (Fall’23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1003 --- share/doc/IPv6/IMPLEMENTATION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/doc/IPv6/IMPLEMENTATION b/share/doc/IPv6/IMPLEMENTATION index 179073383886..ffeb63223561 100644 --- a/share/doc/IPv6/IMPLEMENTATION +++ b/share/doc/IPv6/IMPLEMENTATION @@ -707,7 +707,7 @@ node-local multicast group ff01::1. 1.4.2 Stateless address autoconfiguration on hosts In IPv6 specification, nodes are separated into two categories: -routers and hosts. Routers forward packets addressed to others, hosts does +routers and hosts. Routers forward packets addressed to others, hosts do not forward the packets. net.inet6.ip6.forwarding defines whether this node is a router or a host (router if it is 1, host if it is 0). @@ -1481,7 +1481,7 @@ Users can join groups by using appropriate system calls like setsockopt(2). 1.15.2 Router case -In addition to the above, routers needs to handle the following items. +In addition to the above, routers need to handle the following items. The following items need to be configured manually by using ifconfig(8). o The subnet-router anycast addresses for the interfaces it is configured
git: 0a68b0066f5e - main - fdisk(8): Fix typo forth -> fourth
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=0a68b0066f5efab8b751384a434912b4282f5310 commit 0a68b0066f5efab8b751384a434912b4282f5310 Author: Chih-Chun Wu AuthorDate: 2024-01-07 09:00:36 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 07:17:48 + fdisk(8): Fix typo forth -> fourth Event: Advanced UNIX Programming Course (Fall'23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1010 --- sbin/fdisk/fdisk.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8 index 3c6a73318271..981233f6998d 100644 --- a/sbin/fdisk/fdisk.8 +++ b/sbin/fdisk/fdisk.8 @@ -456,7 +456,7 @@ downwards to correspond to head and cylinder boundaries): Example: to set slices 1, 2 and 4 to .Fx slices, the first being 2 Gigabytes, the second being 10 Gigabytes and the -forth being the remainder of the disk (again, numbers will be rounded +fourth being the remainder of the disk (again, numbers will be rounded appropriately): .Pp .Dl "p 1 165 63 2G"
git: 01d463b6f21d - main - arm64/cmn600: Grammar fix
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=01d463b6f21d027ba16cb4f1040c00b295b1df17
commit 01d463b6f21d027ba16cb4f1040c00b295b1df17
Author: LO WEN-CHIEN
AuthorDate: 2024-01-07 12:32:48 +
Commit: Li-Wen Hsu
CommitDate: 2024-02-13 07:19:22 +
arm64/cmn600: Grammar fix
Event: Advanced UNIX Programming Course (Fall’23) at NTHU
Pull Request: https://github.com/freebsd/freebsd-src/pull/1011
---
sys/arm64/arm64/cmn600.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/arm64/arm64/cmn600.c b/sys/arm64/arm64/cmn600.c
index 7079907e63ce..4e3be8fee40e 100644
--- a/sys/arm64/arm64/cmn600.c
+++ b/sys/arm64/arm64/cmn600.c
@@ -353,7 +353,7 @@ cmn600_create_node(struct cmn600_softc *sc, off_t
node_offset,
child_offset = FLD(val, POR_CFGM_CHILD_INFO_CHILD_PTR_OFFSET);
if (parent == NULL) {
- /* Find XP node with Id 8. It have to be last in a row. */
+ /* Find XP node with Id 8. It has to be last in a row. */
for (i = 0; i < node->nd_child_count; i++) {
val = node->nd_read8(node, child_offset + (i * 8));
val &= POR_CFGM_CHILD_POINTER_BASE_MASK;
git: 1d83ae9d3d66 - main - install(1): Fix typo in usr.bin/xinstall/xinstall.c
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=1d83ae9d3d66e3af9ad192b19578493f6554dd21 commit 1d83ae9d3d66e3af9ad192b19578493f6554dd21 Author: LO WEN-CHIEN AuthorDate: 2024-01-07 12:53:10 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 07:21:45 + install(1): Fix typo in usr.bin/xinstall/xinstall.c Event: Advanced UNIX Programming Course (Fall’23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1012 --- usr.bin/xinstall/xinstall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 66f2c165c683..1e5adadd8f49 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -65,7 +65,7 @@ #include "mtree.h" /* - * Memory strategy threshold, in pages: if physmem is larger then this, use a + * Memory strategy threshold, in pages: if physmem is larger than this, use a * large buffer. */ #define PHYSPAGES_THRESHOLD (32*1024)
git: b1d0cf28ff5b - main - ar(1): Fix grammar error in write.c
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=b1d0cf28ff5b925eb65d6363e32da9cd0d3c3857 commit b1d0cf28ff5b925eb65d6363e32da9cd0d3c3857 Author: LO WEN-CHIEN AuthorDate: 2024-01-07 13:01:56 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 07:31:59 + ar(1): Fix grammar error in write.c Event: Advanced UNIX Programming Course (Fall’23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1013 --- usr.bin/ar/write.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/ar/write.c b/usr.bin/ar/write.c index 1279a1ca7cb8..a630e81480ee 100644 --- a/usr.bin/ar/write.c +++ b/usr.bin/ar/write.c @@ -121,7 +121,7 @@ create_obj_from_file(struct bsdar *bsdar, const char *name, time_t mtime) /* * When option '-u' is specified and member is not newer than the -* existing one, the replace will not happen. While if mtime == 0, +* existing one, the replacement will not happen. While if mtime == 0, * which indicates that this is to "replace a none exist member", * the replace will proceed regardless of '-u'. */
git: 49eeca743b70 - main - stat(1): Fix grammar error in stat.c
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=49eeca743b70d13883ed1db73b6e04fbab791681 commit 49eeca743b70d13883ed1db73b6e04fbab791681 Author: LO WEN-CHIEN AuthorDate: 2024-01-07 13:14:12 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 07:33:16 + stat(1): Fix grammar error in stat.c Event: Advanced UNIX Programming Course (Fall’23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1014 --- usr.bin/stat/stat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c index 720069db3195..1fd8288728c1 100644 --- a/usr.bin/stat/stat.c +++ b/usr.bin/stat/stat.c @@ -1022,7 +1022,7 @@ format1(const struct stat *st, (void)strcat(lfmt, tmp); /* -* For precision of less that nine digits, trim off the +* For precision of less than nine digits, trim off the * less significant figures. */ for (; prec < 9; prec++)
git: 1d479bf6b474 - main - gjournal(8): standardize capitalization for consistency
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=1d479bf6b4741fdc24490ad7179bbef0a78af288 commit 1d479bf6b4741fdc24490ad7179bbef0a78af288 Author: Cheng-Hsun Lin AuthorDate: 2024-01-08 09:37:47 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:09:35 + gjournal(8): standardize capitalization for consistency Event: Advanced UNIX Programming Course (Fall'23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1017 --- lib/geom/journal/gjournal.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/geom/journal/gjournal.8 b/lib/geom/journal/gjournal.8 index 80f987679b10..f9959ffa0f3f 100644 --- a/lib/geom/journal/gjournal.8 +++ b/lib/geom/journal/gjournal.8 @@ -61,7 +61,7 @@ The .Nm utility is used for journal configuration on the given GEOM provider. -The Journal and data may be stored on the same provider or on two separate +The journal and data may be stored on the same provider or on two separate providers. This is block level journaling, not file system level journaling, which means everything gets logged, e.g.\& for file systems, it journals both data and
git: c8e7649b9909 - main - veriexec(8): Fix typo
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=c8e7649b9909edc41bdff6c9f0b720d9e116dcc0 commit c8e7649b9909edc41bdff6c9f0b720d9e116dcc0 Author: Jui-Hsuan Chang AuthorDate: 2024-01-09 16:36:18 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:11:30 + veriexec(8): Fix typo Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1018 --- sbin/veriexec/veriexec.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/veriexec/veriexec.8 b/sbin/veriexec/veriexec.8 index 734b1cda40f6..2e476f327b14 100644 --- a/sbin/veriexec/veriexec.8 +++ b/sbin/veriexec/veriexec.8 @@ -171,6 +171,6 @@ modules. .Sh HISTORY The Verified Exec system first appeared in .Nx . -This utility derrives from the one found in Junos. +This utility derives from the one found in Junos. The key difference is the requirement that manifest files be digitally signed.
git: b287f26c3fc3 - main - setkey(8): Grammar fix: a FQDN -> an FQDN
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=b287f26c3fc3d701ef17fa00cceac6272d353816 commit b287f26c3fc3d701ef17fa00cceac6272d353816 Author: Yi-Chen Li AuthorDate: 2024-01-11 06:31:13 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:12:39 + setkey(8): Grammar fix: a FQDN -> an FQDN Event: Advanced UNIX Programming Course (Fall'23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1024 --- sbin/setkey/setkey.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/setkey/setkey.8 b/sbin/setkey/setkey.8 index 8eece16030e5..88b4dc6fc91f 100644 --- a/sbin/setkey/setkey.8 +++ b/sbin/setkey/setkey.8 @@ -230,7 +230,7 @@ IPv4/v6 address. The .Nm utility -can resolve a FQDN into numeric addresses. +can resolve an FQDN into numeric addresses. If the FQDN resolves into multiple addresses, .Nm will install multiple SAD/SPD entries into the kernel
git: 31f6889564a4 - main - rcorder(8): Fix grammar
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=31f6889564a45a6793d0e26f3da3d3009648dd39 commit 31f6889564a45a6793d0e26f3da3d3009648dd39 Author: Yi-Chen Li AuthorDate: 2024-01-12 05:27:08 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:36:05 + rcorder(8): Fix grammar Event: Advanced UNIX Programming Course (Fall'23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1029 --- sbin/rcorder/rcorder.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/rcorder/rcorder.8 b/sbin/rcorder/rcorder.8 index 5481f821e853..cc94ca6992d5 100644 --- a/sbin/rcorder/rcorder.8 +++ b/sbin/rcorder/rcorder.8 @@ -224,7 +224,7 @@ If a file has an item in or in .Ql BEFORE that could not be provided, -this missing provider and the requirement will be drawn bold red as well. +this missing provider and the requirement will be drawn in bold red as well. .Sh SEE ALSO .Xr acpiconf 8 , .Xr rc 8 ,
git: 9977fb8042a4 - main - camcontrol(8): Fix grammar: a ATA -> an ATA
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=9977fb8042a4b2f2b3386684e137dfb42bf1707f commit 9977fb8042a4b2f2b3386684e137dfb42bf1707f Author: Yi-Chen Li AuthorDate: 2024-01-12 06:37:41 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:37:21 + camcontrol(8): Fix grammar: a ATA -> an ATA Event: Advanced UNIX Programming Course (Fall'23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1030 --- sbin/camcontrol/camcontrol.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8 index ae6d896752fc..bb206bf6ad85 100644 --- a/sbin/camcontrol/camcontrol.8 +++ b/sbin/camcontrol/camcontrol.8 @@ -524,7 +524,7 @@ This is to aid in script writing. Print out transfer rate information. .El .It Ic identify -Send a ATA identify command (0xec) to a device. +Send an ATA identify command (0xec) to a device. .It Ic reportluns Send the SCSI REPORT LUNS (0xA0) command to the given device. By default,
git: c407d351df08 - main - ccdconfig(8): Minor grammar fix
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=c407d351df08a226f81f5de4406f7371aa6ed270 commit c407d351df08a226f81f5de4406f7371aa6ed270 Author: Yi-Chen Li AuthorDate: 2024-01-12 06:49:14 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:38:57 + ccdconfig(8): Minor grammar fix Event: Advanced UNIX Programming Course (Fall'23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1031 --- sbin/ccdconfig/ccdconfig.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8 index 4014a36b0771..ec9bbd6d0ff4 100644 --- a/sbin/ccdconfig/ccdconfig.8 +++ b/sbin/ccdconfig/ccdconfig.8 @@ -145,7 +145,7 @@ are exactly the same as you might place in the configuration file. The first example creates a 4-disk stripe out of four scsi disk partitions. -The stripe uses a 64 sector interleave. +The stripe uses a 64-sector interleave. The second example is an example of a complex stripe/mirror combination. It reads as a two disk stripe of da4 and da5 which is mirrored to a two disk stripe of da6 and da7.
git: e8289f82c005 - main - comcontrol(8): Grammar fix
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=e8289f82c00523a961692362a888d2262f8314d0 commit e8289f82c00523a961692362a888d2262f8314d0 Author: Yi-Chen Li AuthorDate: 2024-01-12 07:10:53 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:40:09 + comcontrol(8): Grammar fix Event: Advanced UNIX Programming Course (Fall'23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1032 --- sbin/comcontrol/comcontrol.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/comcontrol/comcontrol.8 b/sbin/comcontrol/comcontrol.8 index 46c7f987d774..c5fdb52992dc 100644 --- a/sbin/comcontrol/comcontrol.8 +++ b/sbin/comcontrol/comcontrol.8 @@ -35,7 +35,7 @@ to the given number. The units are seconds. The default is 5 minutes, 0 means waiting forever. -This option needed mainly to specify upper limit of minutes +This option is needed mainly to specify an upper limit of minutes to prevent modem hanging. .El .Pp
git: 7a71b350237e - main - devmatch(8): Grammar fix
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=7a71b350237e0b1804abc160b804a204dc409cf2 commit 7a71b350237e0b1804abc160b804a204dc409cf2 Author: Yi-Chen Li AuthorDate: 2024-01-12 07:50:01 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:41:32 + devmatch(8): Grammar fix Event: Advanced UNIX Programming Course (Fall'23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1034 --- sbin/devmatch/devmatch.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/devmatch/devmatch.8 b/sbin/devmatch/devmatch.8 index f5e3a5154a32..71bd7365d645 100644 --- a/sbin/devmatch/devmatch.8 +++ b/sbin/devmatch/devmatch.8 @@ -97,7 +97,7 @@ The term PNP is overloaded in .Fx . It means, generically, the identifying data the bus provides about a device. -While this include old ISA PNP identifiers, it also includes the +While this includes old ISA PNP identifiers, it also includes the logical equivalent in USB, PCI, and others. .Pp Many drivers currently lack proper PNP table decorations and need to
git: d3905a3b07b8 - main - dmesg(8): Fix typo timetamps -> timestamps
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=d3905a3b07b8f784f9c1e8022d0e99ae3832c93e commit d3905a3b07b8f784f9c1e8022d0e99ae3832c93e Author: Yi-Chen Li AuthorDate: 2024-01-12 07:56:41 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:42:49 + dmesg(8): Fix typo timetamps -> timestamps Event: Advanced UNIX Programming Course (Fall'23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1036 --- sbin/dmesg/dmesg.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8 index 2ef3be8b6610..0dca0ff5da89 100644 --- a/sbin/dmesg/dmesg.8 +++ b/sbin/dmesg/dmesg.8 @@ -74,7 +74,7 @@ variables control how the kernel timestamps entries in the message buffer: The default value is shown next to each variable. .Bl -tag -width indent .It kern.msgbuf_show_timestamp : No 0 -If set to 0, no timetamps are added. +If set to 0, no timestamps are added. If set to 1, then a 1-second granularity timestamp will be added to most lines in the message buffer. If set to 2, then a microsecond granularity timestamp will be added.
git: f446c9482cbc - main - libbe(3): Fix typo and grammar
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=f446c9482cbcd1235ed05597e7c8a0bb320d71fe commit f446c9482cbcd1235ed05597e7c8a0bb320d71fe Author: Cheng-Yuan Wu AuthorDate: 2024-01-12 09:11:30 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:52:35 + libbe(3): Fix typo and grammar Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1039 --- lib/libbe/libbe.3 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libbe/libbe.3 b/lib/libbe/libbe.3 index de2c29c65268..0ba5d484bdfc 100644 --- a/lib/libbe/libbe.3 +++ b/lib/libbe/libbe.3 @@ -147,8 +147,8 @@ .Sh DESCRIPTION .Nm interfaces with libzfs to provide a set of functions for various operations -regarding ZFS boot environments including "deep" boot environments in which -a boot environments has child datasets. +regarding ZFS boot environments, including "deep" boot environments in which +a boot environment has child datasets. .Pp A context structure is passed to each function, allowing for a small amount of state to be retained, such as errors from previous operations.
git: 38b7eebc4a52 - main - libbsdstat: Fix typo in bsdstat.h
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=38b7eebc4a523983ae9146cc88dc55ba9ade0abc commit 38b7eebc4a523983ae9146cc88dc55ba9ade0abc Author: Cheng-Yuan Wu AuthorDate: 2024-01-12 08:51:17 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 08:53:35 + libbsdstat: Fix typo in bsdstat.h Event: Advanced UNIX Programming Course (Fall’23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1040 --- lib/libbsdstat/bsdstat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libbsdstat/bsdstat.h b/lib/libbsdstat/bsdstat.h index 9dd9eb2cd00b..1b0d1f24e93f 100644 --- a/lib/libbsdstat/bsdstat.h +++ b/lib/libbsdstat/bsdstat.h @@ -36,7 +36,7 @@ */ /* - * Statistic definition/description. The are defined + * Statistic definition/description. These are defined * for stats that correspond 1-1 w/ a collected stat * and for stats that are calculated indirectly. */
git: 26c3d72eca93 - main - growfs(8): Fix spelling
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=26c3d72eca935191baa4c09563c18b075a4f07a6
commit 26c3d72eca935191baa4c09563c18b075a4f07a6
Author: HUANG,YU-JIA
AuthorDate: 2024-01-13 13:46:28 +
Commit: Li-Wen Hsu
CommitDate: 2024-02-13 09:03:40 +
growfs(8): Fix spelling
Event: Advanced UNIX Programming Course (Fall’23) at NTHU.
Pull Request: https://github.com/freebsd/freebsd-src/pull/1055
---
sbin/growfs/growfs.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c
index daa3931df300..9a48287107e7 100644
--- a/sbin/growfs/growfs.c
+++ b/sbin/growfs/growfs.c
@@ -232,7 +232,7 @@ growfs(int fsi, int fso, unsigned int Nflag)
*
* We probably should rather change the summary for the cylinder group
* statistics here to the value of what would be in there, if the file
-* system were created initially with the new size. Therefor we still
+* system were created initially with the new size. Therefore we still
* need to find an easy way of calculating that.
* Possibly we can try to read the first superblock copy and apply the
* "diffed" stats between the old and new superblock by still copying
@@ -679,7 +679,7 @@ updjcg(int cylno, time_t modtime, int fsi, int fso,
unsigned int Nflag)
sblock.fs_frag);
} else {
/*
-* Lets rejoin a possible partially growed
+* Lets rejoin a possible partially grown
* fragment.
*/
k = 0;
@@ -705,7 +705,7 @@ updjcg(int cylno, time_t modtime, int fsi, int fso,
unsigned int Nflag)
j++;
}
/*
-* Lets rejoin a possible partially growed fragment.
+* Lets rejoin a possible partially grown fragment.
*/
k = 0;
while (isset(cg_blksfree(&acg), i) &&
@@ -733,7 +733,7 @@ updjcg(int cylno, time_t modtime, int fsi, int fso,
unsigned int Nflag)
}
/*
-* Handle the last new block if there are stll some new fragments left.
+* Handle the last new block if there are still some new fragments left.
* Here we don't have to bother about the cluster summary or the even
* the rotational layout table.
*/
git: 2a3a8eb9fac6 - main - libusb(3): Fix link in comment
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=2a3a8eb9fac66183e5af4852bbcb40824629f182
commit 2a3a8eb9fac66183e5af4852bbcb40824629f182
Author: Ting-Hsuan Huang
AuthorDate: 2024-01-12 11:55:00 +
Commit: Li-Wen Hsu
CommitDate: 2024-02-13 08:55:54 +
libusb(3): Fix link in comment
Event: Advanced UNIX Programming Course (Fall’23) at NTHU.
Pull Request: https://github.com/freebsd/freebsd-src/pull/1042
---
lib/libusb/libusb.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h
index 022b5562a819..732fc9dca1e0 100644
--- a/lib/libusb/libusb.h
+++ b/lib/libusb/libusb.h
@@ -245,7 +245,7 @@ enum libusb_log_level {
/* XXX */
/* libusb_set_debug should take parameters from libusb_log_level
* above according to
- * http://libusb.sourceforge.net/api-1.0/group__lib.html
+ * https://libusb.sourceforge.io/api-1.0/group__libusb__lib.html
*/
enum libusb_debug_level {
LIBUSB_DEBUG_NO=0,
git: b00271ceea27 - main - growfs(8): Grammar fix
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=b00271ceea273a229354820a893bcf727d0e6f18 commit b00271ceea273a229354820a893bcf727d0e6f18 Author: HUANG,YU-JIA AuthorDate: 2024-01-13 14:07:33 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 09:05:18 + growfs(8): Grammar fix Event: Advanced UNIX Programming Course (Fall'23) at NTHU. Pull Request: https://github.com/freebsd/freebsd-src/pull/1056 --- sbin/growfs/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/growfs/debug.c b/sbin/growfs/debug.c index 456e67dbc5c2..bfff2acad2b5 100644 --- a/sbin/growfs/debug.c +++ b/sbin/growfs/debug.c @@ -57,7 +57,7 @@ static FILE *dbg_log = NULL; static unsigned intindent = 0; /* - * prototypes not done here, as they come with debug.h + * prototypes are not done here, as they come with debug.h */ /*
git: a400e2590416 - main - ed(1): Fix grammar in comment
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=a400e2590416949987dab710930ffd94539a545a
commit a400e2590416949987dab710930ffd94539a545a
Author: Chia-Jung Chang
AuthorDate: 2024-01-11 22:22:32 +
Commit: Li-Wen Hsu
CommitDate: 2024-02-13 09:55:54 +
ed(1): Fix grammar in comment
Event: Advanced UNIX programming course (Fall'23) at NTHU
Pull Request: https://github.com/freebsd/freebsd-src/pull/1025
---
bin/ed/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/ed/main.c b/bin/ed/main.c
index fefb83b7bc71..57f1faba29c4 100644
--- a/bin/ed/main.c
+++ b/bin/ed/main.c
@@ -1289,7 +1289,7 @@ has_trailing_escape(char *s, char *t)
}
-/* strip_escapes: return copy of escaped string of at most length PATH_MAX */
+/* strip_escapes: return a copy of escaped string of at most length PATH_MAX */
char *
strip_escapes(char *s)
{
git: 304f52ad1ba5 - main - df(1): Fix grammar
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=304f52ad1ba5a9783b2eb547fed33c541e1af901 commit 304f52ad1ba5a9783b2eb547fed33c541e1af901 Author: Chia-Jung Chang AuthorDate: 2024-01-11 22:49:37 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 10:31:05 + df(1): Fix grammar Event: Advance UNIX programming course (Fall'23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1027 --- bin/df/df.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/df/df.1 b/bin/df/df.1 index d3b0b082250a..ceb1bb45babf 100644 --- a/bin/df/df.1 +++ b/bin/df/df.1 @@ -117,7 +117,7 @@ option and any .Ev BLOCKSIZE specification from the environment. .It Fl l -Select locally-mounted file system for display. +Select a locally-mounted file system for display. If used in combination with the .Fl t Ar type option, file system types will be added or excluded according to the
git: 416fdc2d7165 - main - cp(1): Grammar fix in comment
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=416fdc2d71656e2f0b4a16828fb0c736ae32b74a commit 416fdc2d71656e2f0b4a16828fb0c736ae32b74a Author: Chia-Jung Chang AuthorDate: 2024-01-12 01:36:41 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 10:53:50 + cp(1): Grammar fix in comment Event: Advanced UNIX programming course (Fall'23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1033 --- bin/cp/cp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index 14d1cc2a3f75..4d77dfe3feed 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -340,7 +340,7 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) * noexist/dir/foo (where foo is a file in dir), which * is the case where the target exists. * -* Also, check for "..". This is for correct path +* Also, check for "..". This is for the correct path * concatenation for paths ending in "..", e.g. * cp -R .. /tmp * Paths ending in ".." are changed to ".". This is
git: 8e9fc2d9f657 - main - date(1): Grammar fixes
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=8e9fc2d9f657f99ae368524868dd04080bc390bf commit 8e9fc2d9f657f99ae368524868dd04080bc390bf Author: Chia-Jung Chang AuthorDate: 2024-01-12 01:58:35 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 11:00:59 + date(1): Grammar fixes Event: Advanced UNIX programming course (Fall'23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1035 --- bin/date/date.1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/date/date.1 b/bin/date/date.1 index 194635e923b3..286b1f45414a 100644 --- a/bin/date/date.1 +++ b/bin/date/date.1 @@ -223,8 +223,8 @@ day, week day, month or year according to .Ar val . If .Ar val -is preceded with a plus or minus sign, -the date is adjusted forwards or backwards according to the remaining string, +is preceded by a plus or minus sign, +the date is adjusted forward or backward according to the remaining string, otherwise the relevant part of the date is set. The date can be adjusted as many times as required using these flags. Flags are processed in the order given. @@ -284,7 +284,7 @@ will be necessary to reach October 29, 2:30. .Pp When the date is adjusted to a specific value that does not actually exist (for example March 26, 1:30 BST 2000 in the Europe/London timezone), -the date will be silently adjusted forwards in units of one hour until it +the date will be silently adjusted forward in units of one hour until it reaches a valid time. When the date is adjusted to a specific value that occurs twice (for example October 29, 1:30 2000),
git: 26cf4a61f693 - main - hostname(1): Grammar fix
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=26cf4a61f693339ca261d3acaf4d01290acc525e commit 26cf4a61f693339ca261d3acaf4d01290acc525e Author: Chia-Jung Chang AuthorDate: 2024-01-12 02:15:01 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 11:02:17 + hostname(1): Grammar fix Event: Advanced UNIX programming course (Fall'23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1037 --- bin/hostname/hostname.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/hostname/hostname.1 b/bin/hostname/hostname.1 index da9c12d0278a..16f3dd468300 100644 --- a/bin/hostname/hostname.1 +++ b/bin/hostname/hostname.1 @@ -31,7 +31,7 @@ .Os .Sh NAME .Nm hostname -.Nd set or print name of current host system +.Nd set or print the name of current host system .Sh SYNOPSIS .Nm .Op Fl f
git: 90405e1d63ff - main - domainname(1): Grammar fix
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=90405e1d63ff919705422745f19a8b56a37f5ac0 commit 90405e1d63ff919705422745f19a8b56a37f5ac0 Author: Chia-Jung Chang AuthorDate: 2024-01-12 02:30:46 + Commit: Li-Wen Hsu CommitDate: 2024-02-13 11:13:33 + domainname(1): Grammar fix Event: Advanced UNIX programming course (Fall'23) at NTHU Pull Request: https://github.com/freebsd/freebsd-src/pull/1038 --- bin/domainname/domainname.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/domainname/domainname.1 b/bin/domainname/domainname.1 index d83169788f2a..bdadef416ce8 100644 --- a/bin/domainname/domainname.1 +++ b/bin/domainname/domainname.1 @@ -44,7 +44,7 @@ set the domain name by supplying an argument; this is usually done with the .Va nisdomainname variable in the .Pa /etc/rc.conf -file, normally run at boot +file, normally runs at boot time. .Sh NOTES The YP/NIS (formerly ``Yellow Pages'' but renamed for legal reasons)
git: 1b09a310b78c - main - Add link from if_iwlwifi(4) to iwlwifi(4)
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=1b09a310b78cd2965e3a2fc392327d9cc1376a44 commit 1b09a310b78cd2965e3a2fc392327d9cc1376a44 Author: Li-Wen Hsu AuthorDate: 2024-02-22 18:45:22 + Commit: Li-Wen Hsu CommitDate: 2024-02-22 18:45:22 + Add link from if_iwlwifi(4) to iwlwifi(4) MFC after: 3 days Sponsored by: The FreeBSD Foundation --- share/man/man4/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index ab951b107f27..cfa42afa6a71 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -690,6 +690,7 @@ MLINKS+=ipfirewall.4 ipaccounting.4 \ MLINKS+=ipheth.4 if_ipheth.4 MLINKS+=ipw.4 if_ipw.4 MLINKS+=iwi.4 if_iwi.4 +MLINKS+=iwlwifi.4 if_iwlwifi.4 MLINKS+=iwm.4 if_iwm.4 MLINKS+=iwn.4 if_iwn.4 MLINKS+=ixgbe.4 ix.4
git: 861f5b95b39f - main - acpidump(8) Fix typo in error message
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=861f5b95b39fd8a6b10b7bddf29e284e5ba2c49a
commit 861f5b95b39fd8a6b10b7bddf29e284e5ba2c49a
Author: SHENG-YI HONG
AuthorDate: 2024-04-02 17:24:46 +
Commit: Li-Wen Hsu
CommitDate: 2024-04-02 17:28:23 +
acpidump(8) Fix typo in error message
acpidump(8) uses iasl(8) to parse acpi information.
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D44596
---
usr.sbin/acpi/acpidump/acpi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c
index 3ebfefcc591f..8b749f100eac 100644
--- a/usr.sbin/acpi/acpidump/acpi.c
+++ b/usr.sbin/acpi/acpidump/acpi.c
@@ -2231,7 +2231,7 @@ aml_disassemble(ACPI_TABLE_HEADER *rsdt,
ACPI_TABLE_HEADER *dsdp)
goto out;
}
if (status != 0) {
- fprintf(stderr, "iast exit status = %d\n", status);
+ fprintf(stderr, "iasl exit status = %d\n", status);
}
/* Dump iasl's output to stdout */
git: c7bdc25d415a - main - savecore(8): Complete libxo transition
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c7bdc25d415af40cefbb0442b75318ae7028ea7f
commit c7bdc25d415af40cefbb0442b75318ae7028ea7f
Author: Yan-Hao Wang
AuthorDate: 2024-04-03 18:28:30 +
Commit: Li-Wen Hsu
CommitDate: 2024-04-03 18:28:30 +
savecore(8): Complete libxo transition
Reviewed by:des
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D41392
---
sbin/savecore/savecore.c | 50 +---
1 file changed, 26 insertions(+), 24 deletions(-)
diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
index fe42eb66eaae..5ba7e62e7d6c 100644
--- a/sbin/savecore/savecore.c
+++ b/sbin/savecore/savecore.c
@@ -335,7 +335,8 @@ write_header_info(xo_handle_t *xostdout, const struct
kerneldumpheader *kdh,
printheader(xoinfo, kdh, device, bounds, status);
xo_close_container_h(xoinfo, "crashdump");
xo_flush_h(xoinfo);
- xo_finish_h(xoinfo);
+ if (xo_finish_h(xoinfo) < 0)
+ xo_err(EXIT_FAILURE, "stdout");
fclose(info);
return (0);
@@ -433,7 +434,7 @@ check_space(const char *savedir, int savedirfd, off_t
dumpsize, int bounds)
if (fstatfs(savedirfd, &fsbuf) < 0) {
logmsg(LOG_ERR, "%s: %m", savedir);
- exit(1);
+ exit(EXIT_FAILURE);
}
spacefree = ((off_t) fsbuf.f_bavail * fsbuf.f_bsize) / 1024;
totfree = ((off_t) fsbuf.f_bfree * fsbuf.f_bsize) / 1024;
@@ -1123,7 +1124,7 @@ DoFile(const char *savedir, int savedirfd, const char
*device)
if (checkfor) {
printf("A dump exists on %s\n", device);
close(fddev);
- exit(0);
+ exit(EXIT_SUCCESS);
}
if (kdhl.panicstring[0] != '\0')
@@ -1275,7 +1276,8 @@ nuke:
"error while clearing the dump header: %m");
}
xo_close_container_h(xostdout, "crashdump");
- xo_finish_h(xostdout);
+ if (xo_finish_h(xostdout) < 0)
+ xo_err(EXIT_FAILURE, "stdout");
free(dumpkey);
free(temp);
close(fddev);
@@ -1300,7 +1302,7 @@ devify(int argc, char **argv)
devs = malloc(argc * sizeof(*argv));
if (devs == NULL) {
logmsg(LOG_ERR, "malloc(): %m");
- exit(1);
+ exit(EXIT_FAILURE);
}
for (i = 0; i < argc; i++) {
if (strncmp(argv[i], _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0)
@@ -1311,16 +1313,16 @@ devify(int argc, char **argv)
fullpath = malloc(PATH_MAX);
if (fullpath == NULL) {
logmsg(LOG_ERR, "malloc(): %m");
- exit(1);
+ exit(EXIT_FAILURE);
}
l = snprintf(fullpath, PATH_MAX, "%s%s", _PATH_DEV,
argv[i]);
if (l < 0) {
logmsg(LOG_ERR, "snprintf(): %m");
- exit(1);
+ exit(EXIT_FAILURE);
} else if (l >= PATH_MAX) {
logmsg(LOG_ERR, "device name too long");
- exit(1);
+ exit(EXIT_FAILURE);
}
devs[i] = fullpath;
}
@@ -1345,7 +1347,7 @@ enum_dumpdevs(int *argcp)
argv = malloc(n * sizeof(*argv));
if (argv == NULL) {
logmsg(LOG_ERR, "malloc(): %m");
- exit(1);
+ exit(EXIT_FAILURE);
}
for (;;) {
fsp = getfsent();
@@ -1359,13 +1361,13 @@ enum_dumpdevs(int *argcp)
argv = realloc(argv, n * sizeof(*argv));
if (argv == NULL) {
logmsg(LOG_ERR, "realloc(): %m");
- exit(1);
+ exit(EXIT_FAILURE);
}
}
argv[argc] = strdup(fsp->fs_spec);
if (argv[argc] == NULL) {
logmsg(LOG_ERR, "strdup(): %m");
- exit(1);
+ exit(EXIT_FAILURE);
}
argc++;
}
@@ -1382,7 +1384,7 @@ init_caps(int argc, char **argv)
capcas = cap_init();
if (capcas == NULL) {
logmsg(LOG_ERR, "cap_init(): %m");
- exit(1);
+ exit(EXIT_FAILURE);
}
/*
* The fileargs capability does not currently provide a way to limit
@@
git: 1caa5d08613f - main - efitable(8): Complete libxo transition
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=1caa5d08613fbd2b79bbf4b03a0fccc182b4193f
commit 1caa5d08613fbd2b79bbf4b03a0fccc182b4193f
Author: Yan-Hao Wang
AuthorDate: 2024-04-03 18:32:00 +
Commit: Li-Wen Hsu
CommitDate: 2024-04-03 18:32:00 +
efitable(8): Complete libxo transition
Reviewed by:des
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D41411
---
usr.sbin/efitable/efitable.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/usr.sbin/efitable/efitable.c b/usr.sbin/efitable/efitable.c
index 637188957b8b..81d8bb999c58 100644
--- a/usr.sbin/efitable/efitable.c
+++ b/usr.sbin/efitable/efitable.c
@@ -28,7 +28,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -208,7 +207,8 @@ efi_table_print_esrt(const void *data)
xo_close_list("entries");
xo_close_container("esrt");
- xo_finish();
+ if (xo_finish() < 0)
+ xo_err(EX_IOERR, "stdout");
}
static void
@@ -226,7 +226,8 @@ efi_table_print_prop(const void *data)
"{:memory_protection_attribute/%#lx}\n",
prop->memory_protection_attribute);
xo_close_container("prop");
- xo_finish();
+ if (xo_finish() < 0)
+ xo_err(EX_IOERR, "stdout");
}
static void usage(void)
git: e62aee66b0f9 - main - DTrace test: Add a new keyword SKIPCI to gentest.sh
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=e62aee66b0f9020d712d875a5908b34d07ea0118
commit e62aee66b0f9020d712d875a5908b34d07ea0118
Author: Li-Wen Hsu
AuthorDate: 2022-03-24 03:30:27 +
Commit: Li-Wen Hsu
CommitDate: 2022-03-24 03:30:27 +
DTrace test: Add a new keyword SKIPCI to gentest.sh
This is for marking a test case is flakey and should not be executed in
the CI environment.
Reviewed by:markj
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D34635
---
cddl/usr.sbin/dtrace/tests/tools/exclude.sh | 8 +---
cddl/usr.sbin/dtrace/tests/tools/gentest.sh | 4 +++-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
b/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
index 50f825769af1..b0b67a86b86e 100755
--- a/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
+++ b/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
@@ -17,9 +17,11 @@
# 1) and 2).
#
# The SKIP variable contains tests that should not be executed at all. The
-# EXFAIL variable contains tests that are expected to fail when run. Please
-# avoid adding tests to SKIP unless it really is necessary; with EXFAIL, tests
-# that begin passing as the result of a change are visible in the test summary.
+# EXFAIL variable contains tests that are expected to fail when run. The
+# SKIPCI variable contains tests that are flakey and should not be executed in
+# the CI environment. Please avoid adding tests to SKIP unless it really is
+# necessary; with EXFAIL, tests that begin passing as the result of a change
+# are visible in the test summary.
exclude()
{
diff --git a/cddl/usr.sbin/dtrace/tests/tools/gentest.sh
b/cddl/usr.sbin/dtrace/tests/tools/gentest.sh
index 9c34b79f547d..6bad066e5419 100755
--- a/cddl/usr.sbin/dtrace/tests/tools/gentest.sh
+++ b/cddl/usr.sbin/dtrace/tests/tools/gentest.sh
@@ -83,18 +83,20 @@ ARCH=$(dirname ${CATEGORY})
. $EXCLUDES
EXFAILS=$(echo -e "$EXFAIL" | grep "^${CATEGORY}/" | xargs basename -a)
SKIPS=$(echo -e "$SKIP" | grep "^${CATEGORY}/" | xargs basename -a)
+SKIPCIS=$(echo -e "$SKIPCI" | grep "^${CATEGORY}/" | xargs basename -a)
FILELIST=$(mktemp)
trap 'rm -f $FILELIST' EXIT
echo "$@" | tr ' ' '\n' | xargs basename -a | sort > ${FILELIST}
-TFILES=$(printf '%s\n%s' "$EXFAILS" "$SKIPS" | sort | comm -13 /dev/stdin
$FILELIST)
+TFILES=$(printf '%s\n%s' "$EXFAILS" "$SKIPS" "$SKIPCIS" | sort | comm -13
/dev/stdin $FILELIST)
#
# Generate test cases.
#
gentestcases SKIPS "atf_skip \"test may hang or cause system instability\""
gentestcases EXFAILS "atf_expect_fail \"test is known to fail\""
+gentestcases SKIPCIS "if [ \"\$(atf_config_get ci false)\" = \"true\" ]; then
atf_skip \"see cddl/usr.sbin/dtrace/tests/tools/exclude.sh\"; fi"
gentestcases TFILES
#
git: 0088bc444e61 - main - DTrace test: skip flakey common.misc.t_dtrace_contrib.tst_dynopt_d in CI
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=0088bc444e6173a79b2916bf5bc4a938e615b069 commit 0088bc444e6173a79b2916bf5bc4a938e615b069 Author: Li-Wen Hsu AuthorDate: 2022-03-24 03:37:50 + Commit: Li-Wen Hsu CommitDate: 2022-03-24 03:37:50 + DTrace test: skip flakey common.misc.t_dtrace_contrib.tst_dynopt_d in CI PR: 237641 Sponsored by: The FreeBSD Foundation --- cddl/usr.sbin/dtrace/tests/tools/exclude.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cddl/usr.sbin/dtrace/tests/tools/exclude.sh b/cddl/usr.sbin/dtrace/tests/tools/exclude.sh index b0b67a86b86e..26e875073edd 100755 --- a/cddl/usr.sbin/dtrace/tests/tools/exclude.sh +++ b/cddl/usr.sbin/dtrace/tests/tools/exclude.sh @@ -208,3 +208,6 @@ exclude EXFAIL common/usdt/tst.user.ksh # Triggers a lock assertion by using the raise() action from a profile probe. exclude SKIP common/ustack/tst.spin.ksh + +# https://bugs.freebsd.org/237641 +exclude SKIPCI common/misc/tst.dynopt.d
git: 4642a6fac27d - main - Disable building kcov test on powerpcspe
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=4642a6fac27dec23a97ad15d247515b8fba30ae6
commit 4642a6fac27dec23a97ad15d247515b8fba30ae6
Author: Li-Wen Hsu
AuthorDate: 2022-04-14 15:03:00 +
Commit: Li-Wen Hsu
CommitDate: 2022-04-14 15:03:00 +
Disable building kcov test on powerpcspe
It's also 32-bit and lacks support for the needed atomic operations.
Sponsored by: The FreeBSD Foundation
---
tests/sys/kern/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile
index 0a422f42cdd3..120567d32347 100644
--- a/tests/sys/kern/Makefile
+++ b/tests/sys/kern/Makefile
@@ -10,7 +10,8 @@ TESTSRC= ${SRCTOP}/contrib/netbsd-tests/kernel
TESTSDIR= ${TESTSBASE}/sys/kern
ATF_TESTS_C+= basic_signal
-.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "powerpc"
+.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "powerpc" && \
+ ${MACHINE_ARCH} != "powerpcspe"
# No support for atomic_load_64 on i386 or (32-bit) powerpc
ATF_TESTS_C+= kcov
.endif
git: af3993c9e4d7 - main - Catch up another version bump to 14.0
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=af3993c9e4d7445caf92b36df2d8bfc6b76d456d commit af3993c9e4d7445caf92b36df2d8bfc6b76d456d Author: Li-Wen Hsu AuthorDate: 2021-01-22 09:53:59 + Commit: Li-Wen Hsu CommitDate: 2021-01-22 09:53:59 + Catch up another version bump to 14.0 Reported by:rm --- UPDATING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index f3d70c3c1c2e..b947129ca7a5 100644 --- a/UPDATING +++ b/UPDATING @@ -12,7 +12,7 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW: - FreeBSD 13.x has many debugging features turned on, in both the kernel + FreeBSD 14.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of system primitives, and encourage loud failure through extra sanity checking and fail stop semantics. They also substantially impact ___ dev-commits-src-main@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
Re: git: 81e074d57dfc - main - libkern: use compiler builtins for strcpy, strcmp and strlen
On Tue, Feb 9, 2021 at 3:15 AM Mateusz Guzik wrote: > > The branch main has been updated by mjg: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=81e074d57dfcd86f152e2848dc44b77087ee7a2d > > commit 81e074d57dfcd86f152e2848dc44b77087ee7a2d > Author: Mateusz Guzik > AuthorDate: 2021-02-07 19:50:25 + > Commit: Mateusz Guzik > CommitDate: 2021-02-08 19:15:21 + > > libkern: use compiler builtins for strcpy, strcmp and strlen > --- > sys/sys/libkern.h | 4 > 1 file changed, 4 insertions(+) Hi, I suspect this or other commits in: https://ci.freebsd.org/job/FreeBSD-main-amd64-test/17500/changes breaks this test: https://ci.freebsd.org/job/FreeBSD-main-amd64-test/17500/testReport/lib.libc.gen/setdomainname_test/setdomainname_basic/ Can you help check if the code or the test case needs to be fixed? Thanks, Li-Wen ___ dev-commits-src-main@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
git: 655fa0440601 - main - Add if_wg.4 MLINK
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=655fa04406010e56822802e12bf52f42e333988b
commit 655fa04406010e56822802e12bf52f42e333988b
Author: Li-Wen Hsu
AuthorDate: 2021-02-25 16:43:15 +
Commit: Li-Wen Hsu
CommitDate: 2021-02-25 16:43:15 +
Add if_wg.4 MLINK
---
share/man/man4/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 4929ec9fd3f6..686e86cf6897 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -767,6 +767,7 @@ MLINKS+=vr.4 if_vr.4
MLINKS+=vte.4 if_vte.4
MLINKS+=vtnet.4 if_vtnet.4
MLINKS+=watchdog.4 SW_WATCHDOG.4
+MLINKS+=wg.4 if_wg.4
MLINKS+=${_wpi.4} ${_if_wpi.4}
MLINKS+=xl.4 if_xl.4
___
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
Re: git: bc3bba70d834 - main - inetd: Add examples from manual page and other sources
On Sat, Feb 27, 2021 at 3:07 AM Daniel Ebdrup Jensen wrote: > > The branch main has been updated by debdrup (doc committer): > > URL: > https://cgit.FreeBSD.org/src/commit/?id=bc3bba70d834c169475302334b192bc90c17521e > > commit bc3bba70d834c169475302334b192bc90c17521e > Author: Daniel Ebdrup Jensen > AuthorDate: 2021-02-26 19:05:46 + > Commit: Daniel Ebdrup Jensen > CommitDate: 2021-02-26 19:07:03 + > > inetd: Add examples from manual page and other sources ... > Reviewed by:kevans, brueffer, lwhsu, yuripv This is very minor, but for the record, I didn't click "accept" so I am a bit hesitant to be listed in the "Reviewed by" line because I think it implies I have reviewed everything and meet my standard to commit myself. I was just commenting on some very tiny stuff and help. I support the changes but I don't think my contribution is sufficient as a reviewer. I don't even list myself in the reviewers field in the differential. > Differential Revision: https://reviews.freebsd.org/D28882 ... > diff --git a/usr.sbin/inetd/inetd.conf b/usr.sbin/inetd/inetd.conf > index 65a3507a6dc2..7f5f6783a038 100644 > --- a/usr.sbin/inetd/inetd.conf > +++ b/usr.sbin/inetd/inetd.conf ... > +# Example entry for insecure rsync server > +# This is best combined with a VTI like if_ipsec(4) or wg(4) As we discussed in the differential, we can put if_wg(4) here, and they can be MFC'd together. BTW, still thanks very much for you to work on this! Best, Li-Wen ___ dev-commits-src-main@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
git: 4287fa844f5e - main - TEST gitrepo-dev
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=4287fa844f5e8f0021ada77c81ce96f9b547fccf commit 4287fa844f5e8f0021ada77c81ce96f9b547fccf Author: Li-Wen Hsu AuthorDate: 2021-03-05 06:22:09 + Commit: Li-Wen Hsu CommitDate: 2021-03-07 12:52:38 + TEST gitrepo-dev --- README | 1 + 1 file changed, 1 insertion(+) diff --git a/README b/README index aad363baf9ea..481a079c3314 100644 --- a/README +++ b/README @@ -1,3 +1,4 @@ +TEST This is the top level of the FreeBSD source directory. This file was last revised on: $FreeBSD$ ___ dev-commits-src-main@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
git: 2c75196236fc - main - Revert "TEST gitrepo-dev"
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=2c75196236fc1c8516df64c5a97467b96bfa1da2 commit 2c75196236fc1c8516df64c5a97467b96bfa1da2 Author: Li-Wen Hsu AuthorDate: 2021-03-07 17:34:21 + Commit: Li-Wen Hsu CommitDate: 2021-03-07 17:34:21 + Revert "TEST gitrepo-dev" This reverts commit 4287fa844f5e8f0021ada77c81ce96f9b547fccf. --- README | 1 - 1 file changed, 1 deletion(-) diff --git a/README b/README index 481a079c3314..aad363baf9ea 100644 --- a/README +++ b/README @@ -1,4 +1,3 @@ -TEST This is the top level of the FreeBSD source directory. This file was last revised on: $FreeBSD$ ___ dev-commits-src-main@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
Re: git: 1ae20f7c70ea - main - kern: malloc: fix panic on M_WAITOK during THREAD_NO_SLEEPING()
On Tue, Mar 9, 2021 at 7:18 PM Kyle Evans wrote:
>
> The branch main has been updated by kevans:
>
> URL:
> https://cgit.FreeBSD.org/src/commit/?id=1ae20f7c70ea16fa8b702e409030e170df4f5c13
>
> commit 1ae20f7c70ea16fa8b702e409030e170df4f5c13
> Author: Kyle Evans
> AuthorDate: 2021-03-08 06:16:27 +
> Commit: Kyle Evans
> CommitDate: 2021-03-09 11:16:39 +
>
> kern: malloc: fix panic on M_WAITOK during THREAD_NO_SLEEPING()
>
> Simple condition flip; we wanted to panic here after epoch_trace_list().
>
> Reviewed by:glebius, markj
> MFC after: 3 days
> Differential Revision: https://reviews.freebsd.org/D29125
> ---
> sys/kern/kern_malloc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
> index 48383358e3ad..0d6f9dcfcab7 100644
> --- a/sys/kern/kern_malloc.c
> +++ b/sys/kern/kern_malloc.c
> @@ -537,7 +537,7 @@ malloc_dbg(caddr_t *vap, size_t *sizep, struct
> malloc_type *mtp,
> #ifdef EPOCH_TRACE
> epoch_trace_list(curthread);
> #endif
> - KASSERT(1,
> + KASSERT(0,
> ("malloc(M_WAITOK) with sleeping prohibited"));
> }
> }
I guess this reveals a bug in gmirror? Now the test case
sys/geom/class/mirror/8_test:main panics:
https://ci.freebsd.org/job/FreeBSD-main-amd64-test/17779/console
https://ci.freebsd.org/job/FreeBSD-main-i386-test/11831/console
Li-Wen
___
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
git: cada2b74b8d6 - main - Update doc links in README
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=cada2b74b8d670741643dca8e3d40c39d8fc7105 commit cada2b74b8d670741643dca8e3d40c39d8fc7105 Author: Li-Wen Hsu AuthorDate: 2021-03-12 11:55:56 + Commit: Li-Wen Hsu CommitDate: 2021-03-12 11:57:58 + Update doc links in README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e6899c7549e0..67428843ee20 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ For copyright information, please see [the file COPYRIGHT](COPYRIGHT) in this di Additional copyright information also exists for some sources in this tree - please see the specific source directories for more information. The Makefile in this directory supports a number of targets for building components (or all) of the FreeBSD source tree. -See build(7), config(8), [FreeBSD handbook on building userland](https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html), and [Handbook for kernels](https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html) for more information, including setting make(1) variables. +See build(7), config(8), [FreeBSD handbook on building userland](https://docs.freebsd.org/en/books/handbook/cutting-edge/#makeworld), and [Handbook for kernels](https://docs.freebsd.org/en/books/handbook/kernelconfig/) for more information, including setting make(1) variables. Source Roadmap: --- @@ -39,4 +39,4 @@ Source Roadmap: | usr.bin | User commands. | | usr.sbin | System administration commands. | -For information on synchronizing your source tree with one or more of the FreeBSD Project's development branches, please see [FreeBSD Handbook](https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/current-stable.html). +For information on synchronizing your source tree with one or more of the FreeBSD Project's development branches, please see [FreeBSD Handbook](https://docs.freebsd.org/en/books/handbook/cutting-edge/#current-stable). ___ dev-commits-src-main@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
git: aaf998056ed4 - main - Whitespace cleanup
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=aaf998056ed46c0dfb429e3e5cfe624c8aa4dec8 commit aaf998056ed46c0dfb429e3e5cfe624c8aa4dec8 Author: Li-Wen Hsu AuthorDate: 2021-03-12 11:57:30 + Commit: Li-Wen Hsu CommitDate: 2021-03-12 11:57:58 + Whitespace cleanup --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 67428843ee20..89972e866b61 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ See build(7), config(8), [FreeBSD handbook on building userland](https://docs.fr Source Roadmap: --- | Directory | Description | -| - | | +| - | --- | | bin | System/user commands. | | cddl | Various commands and libraries under the Common Development and Distribution License. | | contrib | Packages contributed by 3rd parties. | ___ dev-commits-src-main@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
git: 8ef03ce6db33 - main - development(7): mention the Git mirror list in the manual page
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=8ef03ce6db330fcc20e800c4d15a9f4915c56c43 commit 8ef03ce6db330fcc20e800c4d15a9f4915c56c43 Author: Evgeniy Khramtsov AuthorDate: 2021-03-19 12:52:21 + Commit: Li-Wen Hsu CommitDate: 2021-03-19 12:52:21 + development(7): mention the Git mirror list in the manual page MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D29234 --- share/man/man7/development.7 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man7/development.7 b/share/man/man7/development.7 index 67f317b8ec26..6a2d872e506f 100644 --- a/share/man/man7/development.7 +++ b/share/man/man7/development.7 @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 17, 2021 +.Dd March 19, 2021 .Dt DEVELOPMENT 7 .Os .Sh NAME @@ -67,9 +67,9 @@ The push URL is: .Pp .Lk ssh://g...@gitrepo.freebsd.org/src.git .Pp -There is also a public, read-only GitHub mirror at: +There is also a list of public, read-only Git mirrors at: .Pp -.Lk https://github.com/freebsd/freebsd-src +.Lk https://docs.FreeBSD.org/en/books/handbook/mirrors/#_external_mirrors .Pp The .Ql main ___ dev-commits-src-main@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
git: 819961c5808b - main - Temporarily skip sys.geom.class.multipath.failloop.failloop in CI
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=819961c5808b053c626648e202dec42a19ebe7a6
commit 819961c5808b053c626648e202dec42a19ebe7a6
Author: Li-Wen Hsu
AuthorDate: 2021-09-28 18:02:27 +
Commit: Li-Wen Hsu
CommitDate: 2021-09-28 18:02:27 +
Temporarily skip sys.geom.class.multipath.failloop.failloop in CI
This test case uses `dtrace -c` but it has some issues at the moment
While here, add a checker for dtrace executes successfully or not to provide
a more informative error message.
PR: 258763
Sponsored by: The FreeBSD Foundation
---
tests/sys/geom/class/multipath/failloop.sh | 7 +++
1 file changed, 7 insertions(+)
diff --git a/tests/sys/geom/class/multipath/failloop.sh
b/tests/sys/geom/class/multipath/failloop.sh
index f9a1417ae37f..b089f0f53d11 100755
--- a/tests/sys/geom/class/multipath/failloop.sh
+++ b/tests/sys/geom/class/multipath/failloop.sh
@@ -36,6 +36,10 @@ failloop_head()
}
failloop_body()
{
+ if [ "$(atf_config_get ci false)" = "true" ]; then
+ atf_skip "https://bugs.freebsd.org/258763";
+ fi
+
sysctl -n kern.geom.notaste > kern.geom.notaste.txt
load_gnop
load_gmultipath
@@ -59,6 +63,9 @@ failloop_body()
# The dd command should've failed ...
atf_check_equal 1 $dd_status
# and triggered 1 or 2 path restores
+ if [ ! -f restore_count ]; then
+ atf_fail "dtrace didn't execute succfully"
+ fi
if [ `cat restore_count` -gt 2 ]; then
atf_fail "gmultipath restored paths too many times"
fi
___
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
git: 38dac71d0a95 - main - Fix typo
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=38dac71d0a95ab2cf2cdfa1232cc556008b7ac94 commit 38dac71d0a95ab2cf2cdfa1232cc556008b7ac94 Author: Li-Wen Hsu AuthorDate: 2021-09-28 18:28:01 + Commit: Li-Wen Hsu CommitDate: 2021-09-28 18:28:01 + Fix typo Reported by:swills Sponsored by: The FreeBSD Foundation --- tests/sys/geom/class/multipath/failloop.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/geom/class/multipath/failloop.sh b/tests/sys/geom/class/multipath/failloop.sh index b089f0f53d11..632458e1f0b1 100755 --- a/tests/sys/geom/class/multipath/failloop.sh +++ b/tests/sys/geom/class/multipath/failloop.sh @@ -64,7 +64,7 @@ failloop_body() atf_check_equal 1 $dd_status # and triggered 1 or 2 path restores if [ ! -f restore_count ]; then - atf_fail "dtrace didn't execute succfully" + atf_fail "dtrace didn't execute successfully" fi if [ `cat restore_count` -gt 2 ]; then atf_fail "gmultipath restored paths too many times" ___ dev-commits-src-main@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
git: b9b5a4dd590e - main - gmultipath failloop test: Put the dtrace sanity checker in right place
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=b9b5a4dd590e1b30d92dc73b3d1f22d3303e7e41
commit b9b5a4dd590e1b30d92dc73b3d1f22d3303e7e41
Author: Li-Wen Hsu
AuthorDate: 2021-09-28 18:38:34 +
Commit: Li-Wen Hsu
CommitDate: 2021-09-28 18:38:34 +
gmultipath failloop test: Put the dtrace sanity checker in right place
Check if dtrace excution is successful or not right after execution.
Sponsored by: The FreeBSD Foundation
---
tests/sys/geom/class/multipath/failloop.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/sys/geom/class/multipath/failloop.sh
b/tests/sys/geom/class/multipath/failloop.sh
index 632458e1f0b1..48006d6b10da 100755
--- a/tests/sys/geom/class/multipath/failloop.sh
+++ b/tests/sys/geom/class/multipath/failloop.sh
@@ -60,12 +60,12 @@ failloop_body()
-i 'geom:multipath:config:restore {@restore = count()}' \
-c "dd if=/dev/zero of=/dev/multipath/"$name" bs=4096 count=1" \
2>&1 | awk '/exited with status/ {print $NF}'`
- # The dd command should've failed ...
- atf_check_equal 1 $dd_status
- # and triggered 1 or 2 path restores
if [ ! -f restore_count ]; then
atf_fail "dtrace didn't execute successfully"
fi
+ # The dd command should've failed ...
+ atf_check_equal 1 $dd_status
+ # and triggered 1 or 2 path restores
if [ `cat restore_count` -gt 2 ]; then
atf_fail "gmultipath restored paths too many times"
fi
___
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
git: 0b159faaca08 - main - Temporarily skip flaky tset cases under sys.aio.aio_test in CI
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=0b159faaca08e6cc89abcd29b4b1360f97e18245
commit 0b159faaca08e6cc89abcd29b4b1360f97e18245
Author: Li-Wen Hsu
AuthorDate: 2021-09-28 19:32:47 +
Commit: Li-Wen Hsu
CommitDate: 2021-09-28 19:32:47 +
Temporarily skip flaky tset cases under sys.aio.aio_test in CI
- sys.aio.aio_test.vectored_unaligned
- sys.aio.aio_test.vectored_zvol_poll
PR: 258766
Sponsored by: The FreeBSD Foundation
---
tests/sys/aio/aio_test.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/tests/sys/aio/aio_test.c b/tests/sys/aio/aio_test.c
index c3cf1d372e23..44bf85a10241 100644
--- a/tests/sys/aio/aio_test.c
+++ b/tests/sys/aio/aio_test.c
@@ -1813,6 +1813,9 @@ ATF_TC_BODY(vectored_unaligned, tc)
ssize_t len, total_len;
int fd;
+ if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false))
+ atf_tc_skip("https://bugs.freebsd.org/258766";);
+
ATF_REQUIRE_KERNEL_MODULE("aio");
ATF_REQUIRE_UNSAFE_AIO();
@@ -1902,6 +1905,8 @@ ATF_TC_HEAD(vectored_zvol_poll, tc)
}
ATF_TC_BODY(vectored_zvol_poll, tc)
{
+ if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false))
+ atf_tc_skip("https://bugs.freebsd.org/258766";);
aio_zvol_test(poll, NULL, true);
}
ATF_TC_CLEANUP(vectored_zvol_poll, tc)
___
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
git: 5f07d7fe408b - main - mgb: Fix DEBUG (and LINT) build
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=5f07d7fe408bbca5c2f6755c363128107916c08d
commit 5f07d7fe408bbca5c2f6755c363128107916c08d
Author: Li-Wen Hsu
AuthorDate: 2021-09-29 08:34:59 +
Commit: Li-Wen Hsu
CommitDate: 2021-09-29 08:34:59 +
mgb: Fix DEBUG (and LINT) build
Sponsored by: The FreeBSD Foundation
---
sys/dev/mgb/if_mgb.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/sys/dev/mgb/if_mgb.c b/sys/dev/mgb/if_mgb.c
index d4dda0bf65fd..bc944c92625c 100644
--- a/sys/dev/mgb/if_mgb.c
+++ b/sys/dev/mgb/if_mgb.c
@@ -693,7 +693,6 @@ mgb_dump_some_stats(struct mgb_softc *sc)
i, sc->tx_ring_data.ring[i].addr.high,
i, sc->tx_ring_data.ring[i].sts);
device_printf(sc->dev, " DUMP_TX_DMA_RAM \n");
- int i;
CSR_WRITE_REG(sc, 0x24, 0xF); // DP_SEL & TX_RAM_0
for (i = 0; i < 128; i++) {
CSR_WRITE_REG(sc, 0x2C, i); // DP_ADDR
___
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
git: fbece7609573 - main - Update Azure release bits
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=fbece7609573bd51080e949df03fa3d803a637ae
commit fbece7609573bd51080e949df03fa3d803a637ae
Author: Li-Wen Hsu
AuthorDate: 2021-10-01 20:59:10 +
Commit: Li-Wen Hsu
CommitDate: 2021-10-01 20:59:10 +
Update Azure release bits
Imports the changes for building official images on Azure Marketplace,
which fulfill the requirements of Azure and FreeBSD cloud images like
disk layout and UEFI for Gen2 VM, along with some minor improvements like
configurations to speed up booting.
"CLOUDWARE" list will be updated after some more collaborations with re
completed.
Reviewed by:re (gjb)
Sponsored by: The FreeBSD Foundation
Technical assistance from: Microsoft
Differential Revision: https://reviews.freebsd.org/D23804
---
release/Makefile.azure | 55 +---
release/Makefile.vm| 2 +-
release/tools/azure.conf | 57 ++
release/tools/vmimage.subr | 7 +-
4 files changed, 87 insertions(+), 34 deletions(-)
diff --git a/release/Makefile.azure b/release/Makefile.azure
index 32e91833b766..b8e7418f35f7 100644
--- a/release/Makefile.azure
+++ b/release/Makefile.azure
@@ -11,8 +11,8 @@ AZURE_UPLOAD_TGTS=azure-check-depends \
CLEANFILES+= ${AZURE_UPLOAD_TGTS}
.if defined(AZURE_UPLOAD_CONF) && !empty(AZURE_UPLOAD_CONF)
-. for VAR in _STORAGE _ACCOUNT _KEY
-AZURE${VAR}!= grep -E ^AZURE${VAR} ${AZURE_UPLOAD_CONF} | awk -F' '
'{print $$2}'
+. for VAR in _STORAGE _ACCOUNT _RESOURCEGROUP _KEY _LOCATION
+AZURE${VAR}!= grep -E ^AZURE${VAR}= ${AZURE_UPLOAD_CONF} | awk '{print $$2}'
. endfor
.endif
@@ -20,34 +20,53 @@ AZURE${VAR}!= grep -E ^AZURE${VAR}
${AZURE_UPLOAD_CONF} | awk -F' ' '{print $$2}
SNAPSHOT_DATE!=date +-${BUILDDATE}
.endif
-AZURE_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}.vhd
+AZURE_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE}
+
+START_DATE!= date -v-1d -I -u
+EXPIRY_DATE!= date -v+1m -I -u
azure-upload: ${AZURE_UPLOAD_TGTS}
azure-check-depends:
-.for VAR in _STORAGE _ACCOUNT _KEY
+.for VAR in _STORAGE _ACCOUNT _RESOURCEGROUP _KEY
. if !defined(AZURE${VAR}) || empty(AZURE${VAR})
@echo "Variable AZURE${VAR} cannot be empty."
@false
. endif
.endfor
-.if !exists(/usr/local/bin/azure)
-. if !exists(/usr/local/bin/npm)
-. if !exists(${PORTSDIR}/www/npm/Makefile)
-. if !exists(/usr/local/sbin/pkg-static)
+.if !exists(/usr/local/bin/az)
+. if !exists(${PORTSDIR}/sysutils/py-azure-cli/Makefile)
+. if !exists(/usr/local/sbin/pkg-static)
env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf
-. endif
- env ASSUME_ALWAYS_YES=yes pkg install -y www/npm
-. else
- env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/www/npm BATCH=1 all install
clean
. endif
+ env ASSUME_ALWAYS_YES=yes pkg install -y py38-azure-cli
+. else
+ env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/sysutils/py-azure-cli
BATCH=1 all install clean
. endif
- npm install -g azure-cli
.endif
azure-do-upload:
- /usr/local/bin/azure storage blob upload \
- ${AZURE_IMG} ${AZURE_STORAGE} ${AZURE_TARGET} \
- -t page -a ${AZURE_ACCOUNT} -k "${AZURE_KEY}"
- touch ${.OBJDIR}/${.TARGET}
-
+ /usr/local/bin/az storage blob upload \
+ --account-name ${AZURE_ACCOUNT} --account-key ${AZURE_KEY} \
+ --container-name ${AZURE_STORAGE} --type page \
+ --file ${AZURE_IMG} --name ${AZURE_TARGET}.vhd
+ @echo "The disk access URL with shared access signature is:"
+ @echo
+ @echo -n
https://${AZURE_ACCOUNT}.blob.core.windows.net/${AZURE_STORAGE}/${AZURE_TARGET}.vhd?
+ @/usr/local/bin/az storage container generate-sas \
+ --account-name ${AZURE_ACCOUNT} --account-key ${AZURE_KEY} \
+ --name ${AZURE_STORAGE} \
+ --permissions lr \
+ --start ${START_DATE} \
+ --expiry ${EXPIRY_DATE} | cut -d '"' -f 2
+ @echo
+ @echo "Please go to Microsoft Partner Center to create a new offer and
publish it:"
+ @echo
+ @echo
"https://partner.microsoft.com/dashboard/commercial-marketplace/overview";
+ @echo
+ @echo "After the new offer status is live, you can delete the disk file
with:"
+ @echo
+ @echo /usr/local/bin/az storage blob delete \
+ --account-name ${AZURE_ACCOUNT} --account-key ${AZURE_KEY} \
+ --container-name ${AZURE_STORAGE} --name ${AZURE_TARGET}.vhd
+ @echo
diff --git a/release/Makefile.vm b/release/Makefile.vm
index 2240a1e5fc57..72b150022ef7 100644
--- a/release/Makefile.vm
+++ b/release/Mak
git: 2d827c065a1c - main - Skip sys.net.if_lagg_test.status_stress in CI
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=2d827c065a1c6ed12d48fc71ab41443e2de0936f
commit 2d827c065a1c6ed12d48fc71ab41443e2de0936f
Author: Li-Wen Hsu
AuthorDate: 2021-10-11 21:40:24 +
Commit: Li-Wen Hsu
CommitDate: 2021-10-11 21:40:24 +
Skip sys.net.if_lagg_test.status_stress in CI
This case panics the machine fairly often and we should run
stress tests separately.
Sponsored by: The FreeBSD Foundation
---
tests/sys/net/if_lagg_test.sh | 4
1 file changed, 4 insertions(+)
diff --git a/tests/sys/net/if_lagg_test.sh b/tests/sys/net/if_lagg_test.sh
index 1c9cc5551ae3..cf1dcd4359ca 100755
--- a/tests/sys/net/if_lagg_test.sh
+++ b/tests/sys/net/if_lagg_test.sh
@@ -84,6 +84,10 @@ status_stress_body()
{
local TAP0 TAP1 LAGG MAC
+ if [ "$(atf_config_get ci false)" = "true" ]; then
+ atf_skip "Skipping this test because it panics the machine
fairly often"
+ fi
+
# Configure the lagg interface to use an RFC5737 nonrouteable addresses
ADDR="192.0.2.2"
MASK="24"
git: d5fd5cdc0638 - main - Temporarily skip sys.netgraph.hub.loop on RISC-V in CI
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=d5fd5cdc063857132de19a94f63d1adbc581494e
commit d5fd5cdc063857132de19a94f63d1adbc581494e
Author: Li-Wen Hsu
AuthorDate: 2021-10-13 21:31:22 +
Commit: Li-Wen Hsu
CommitDate: 2021-10-13 21:31:22 +
Temporarily skip sys.netgraph.hub.loop on RISC-V in CI
This case panics kernel.
PR: 259157
Sponsored by: The FreeBSD Foundation
---
tests/sys/netgraph/hub.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/tests/sys/netgraph/hub.c b/tests/sys/netgraph/hub.c
index 08d083ad9605..9a5ba74b2ad5 100644
--- a/tests/sys/netgraph/hub.c
+++ b/tests/sys/netgraph/hub.c
@@ -127,6 +127,11 @@ ATF_TC_BODY(loop, dummy)
int i;
charmsg[] = "LOOP Alert!";
+#if defined(__riscv)
+ if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false))
+ atf_tc_skip("https://bugs.freebsd.org/259157";);
+#endif
+
ng_errors(PASS);
ng_shutdown("hub1:");
ng_shutdown("hub2:");
git: 168b579a4884 - main - Fix RISC-V build
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=168b579a4884ab44833b758d9e770c87a37025fc
commit 168b579a4884ab44833b758d9e770c87a37025fc
Author: Li-Wen Hsu
AuthorDate: 2021-10-14 15:20:12 +
Commit: Li-Wen Hsu
CommitDate: 2021-10-14 15:20:12 +
Fix RISC-V build
Fixes: d5fd5cdc063
---
tests/sys/netgraph/hub.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/sys/netgraph/hub.c b/tests/sys/netgraph/hub.c
index 9a5ba74b2ad5..5fda9b8c7688 100644
--- a/tests/sys/netgraph/hub.c
+++ b/tests/sys/netgraph/hub.c
@@ -128,7 +128,7 @@ ATF_TC_BODY(loop, dummy)
charmsg[] = "LOOP Alert!";
#if defined(__riscv)
- if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false))
+ if (atf_tc_get_config_var_as_bool_wd(dummy, "ci", false))
atf_tc_skip("https://bugs.freebsd.org/259157";);
#endif
git: 73f8667ed4d5 - main - Document my doc commit bit history
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=73f8667ed4d5c483ef5602698cdd7cd24b1c2290 commit 73f8667ed4d5c483ef5602698cdd7cd24b1c2290 Author: Li-Wen Hsu AuthorDate: 2021-10-22 03:54:06 + Commit: Li-Wen Hsu CommitDate: 2021-10-22 03:54:06 + Document my doc commit bit history Reminded by:ygy --- share/misc/committers-doc.dot | 5 + 1 file changed, 5 insertions(+) diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot index a4297f2442db..8a256548e758 100644 --- a/share/misc/committers-doc.dot +++ b/share/misc/committers-doc.dot @@ -82,6 +82,7 @@ joel [label="Joel Dahl\nj...@freebsd.org\n2005/04/05"] keramida [label="Giorgos Keramidas\nkeram...@freebsd.org\n2001/10/12"] linimon [label="Mark Linimon\nlini...@freebsd.org\n2004/03/31"] loader [label="Fukang Chen\nloa...@freebsd.org\n2007/07/30"] +lwhsu [label="Li-Wen Hsu\nlw...@freebsd.org\n2021/08/01"] manolis [label="Manolis Kiagias\nmano...@freebsd.org\n2008/05/24"] marck [label="Dmitry Morozovsky\nma...@freebsd.org\n2004/08/10"] maxim [label="Maxim Konovalov\nma...@freebsd.org\n2002/02/07"] @@ -132,6 +133,8 @@ blackend -> ceri brueffer -> joel +carlavilla -> lwhsu + ceri -> brd ceri -> brueffer ceri -> linimon @@ -210,4 +213,6 @@ trhodes -> jcamou wblock -> jgh wblock -> allanjude + +ygy -> lwhsu }
git: cfd8fda15939 - main - RELNOTES: Fix KMSAN entry
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=cfd8fda15939c931d3788d49d6cad586c7899bd9 commit cfd8fda15939c931d3788d49d6cad586c7899bd9 Author: Elliott Mitchell AuthorDate: 2021-10-22 07:16:54 + Commit: Li-Wen Hsu CommitDate: 2021-10-22 07:16:54 + RELNOTES: Fix KMSAN entry The lead digit was lost in 05eba8e068c1 making it impossible to find the commit. The two subsequent RELNOTES commits gave one less digit of the commit hash, which is what `git rev-parse --short` thinks the minimal length is, but keep them to align with other entries. Fixes: 05eba8e068c1 Differential Revision: https://reviews.freebsd.org/D32595 --- RELNOTES | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RELNOTES b/RELNOTES index 60942ddd5422..0c6c1c2f4ffc 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,16 +10,16 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. -d410b585b6f: +d410b585b6f0: sh(1) is now the default shell for the root user. -396851c20ae: +396851c20aeb: libncursesw has been split into libtinfow and libncursesw, linker scripts should make it transparent for consumers. pkg-config files are also now installed to ease ports detecting the ncurses setup from base. -422084abbda: +a422084abbda: LLVM's MemorySanitizer can now be used in amd64 kernels. See the kmsan(9) manual page for more information.
git: 9c0287e0920a - main - release: Remove unused variables in azure Makefile
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=9c0287e0920ad7a16c75e62e914cd69c439dba1c
commit 9c0287e0920ad7a16c75e62e914cd69c439dba1c
Author: Li-Wen Hsu
AuthorDate: 2021-11-04 08:42:38 +
Commit: Li-Wen Hsu
CommitDate: 2021-11-04 08:42:38 +
release: Remove unused variables in azure Makefile
Approved by:re (gjb)
Sponsored by: The FreeBSD Foundation
---
release/Makefile.azure | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/release/Makefile.azure b/release/Makefile.azure
index bc6f8859dea9..4e9e33184dfc 100644
--- a/release/Makefile.azure
+++ b/release/Makefile.azure
@@ -11,7 +11,7 @@ AZURE_UPLOAD_TGTS=azure-check-depends \
CLEANFILES+= ${AZURE_UPLOAD_TGTS}
.if defined(AZURE_UPLOAD_CONF) && !empty(AZURE_UPLOAD_CONF)
-. for VAR in _STORAGE _ACCOUNT _RESOURCEGROUP _KEY _LOCATION
+. for VAR in _STORAGE _ACCOUNT _KEY
AZURE${VAR}!= grep -E '^AZURE${VAR}' ${AZURE_UPLOAD_CONF} | awk -F ' '
'{print $$2}'
. endfor
.endif
@@ -28,7 +28,7 @@ EXPIRY_DATE!= date -v+1m -I -u
azure-upload: ${AZURE_UPLOAD_TGTS}
azure-check-depends:
-.for VAR in _STORAGE _ACCOUNT _RESOURCEGROUP _KEY _LOCATION
+.for VAR in _STORAGE _ACCOUNT _KEY
. if !defined(AZURE${VAR}) || empty(AZURE${VAR})
@echo "Variable AZURE${VAR} cannot be empty."
@false
git: 164d49a5842d - main - Correct the link of external mirrors
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=164d49a5842dcd07823570eaa775e82ed10022d3 commit 164d49a5842dcd07823570eaa775e82ed10022d3 Author: Li-Wen Hsu AuthorDate: 2021-04-28 19:39:18 + Commit: Li-Wen Hsu CommitDate: 2021-04-28 19:39:18 + Correct the link of external mirrors Reported by:0mp Fixes: 8ef03ce6db33 MFC after: 1 day --- share/man/man7/development.7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man7/development.7 b/share/man/man7/development.7 index 6a2d872e506f..a0459ccfad72 100644 --- a/share/man/man7/development.7 +++ b/share/man/man7/development.7 @@ -69,7 +69,7 @@ The push URL is: .Pp There is also a list of public, read-only Git mirrors at: .Pp -.Lk https://docs.FreeBSD.org/en/books/handbook/mirrors/#_external_mirrors +.Lk https://docs.freebsd.org/en/books/handbook/mirrors/#external-mirrors .Pp The .Ql main ___ dev-commits-src-main@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
Re: git: 5d8fd932e418 - main - This brings into sync FreeBSD with the netflix versions of rack and bbr. This fixes several breakages (panics) since the tcp_lro code was committed that have been report
On Thu, May 6, 2021 at 11:26 PM Randall Stewart wrote: > > The branch main has been updated by rrs: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=5d8fd932e418f03e98b3469c4088a36f0ef34ffe > > commit 5d8fd932e418f03e98b3469c4088a36f0ef34ffe > Author: Randall Stewart > AuthorDate: 2021-05-06 15:22:26 + > Commit: Randall Stewart > CommitDate: 2021-05-06 15:22:26 + > > This brings into sync FreeBSD with the netflix versions of rack and bbr. > This fixes several breakages (panics) since the tcp_lro code was > committed that have been reported. Quite a few new features are > now in rack (prefecting of DGP -- Dynamic Goodput Pacing among the > largest). There is also support for ack-war prevention. Documents > comming soon on rack.. > > Sponsored by: Netflix > Reviewed by:rscheff, mtuexen > Differential Revision: https://reviews.freebsd.org/D30036 This seems braking LINT kernel build of powerpc: https://ci.freebsd.org/job/FreeBSD-main-powerpc-LINT/6082/console Searching "error:" leads to: 00:08:15.153 /workspace/src/sys/modules/tcp/rack/../../../netinet/tcp_stacks/rack.c:2143:16: error: implicit declaration of function 'tcp_hw_highest_rate' is invalid in C99 [-Werror,-Wimplicit-function-declaration] 00:08:15.153 high_rate = tcp_hw_highest_rate(rack->r_ctl.crte); 00:08:15.153 ^ and 00:08:15.163 /workspace/src/sys/modules/tcp/rack/../../../netinet/tcp_stacks/rack.c:2165:16: error: implicit declaration of function 'tcp_hw_highest_rate_ifp' is invalid in C99 [-Werror,-Wimplicit-function-declaration] 00:08:15.163 high_rate = tcp_hw_highest_rate_ifp(rack->rc_inp->inp_route.ro_nh->nh_ifp, rack->rc_inp); 00:08:15.163 ^ I suspect this is because RATELIMIT is not defined in default powerpc build? Is it safe to enable it? Best, Li-Wen ___ dev-commits-src-main@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
git: 315674fb6acc - main - Add freeze/thaw description to devctl(8)
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=315674fb6acc4fa54cf82de3863c349c5a71f498 commit 315674fb6acc4fa54cf82de3863c349c5a71f498 Author: Li-Wen Hsu AuthorDate: 2021-06-01 04:33:12 + Commit: Li-Wen Hsu CommitDate: 2021-06-01 04:33:12 + Add freeze/thaw description to devctl(8) This is a follow-up to 5fa29797910346fc0c54829bd979856e83b9b7ea . PR: 256311 Reviewed by:imp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D29867 --- usr.sbin/devctl/devctl.8 | 23 ++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/usr.sbin/devctl/devctl.8 b/usr.sbin/devctl/devctl.8 index 17f480bd66ee..965c310d0868 100644 --- a/usr.sbin/devctl/devctl.8 +++ b/usr.sbin/devctl/devctl.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 4, 2019 +.Dd June 1, 2021 .Dt DEVCTL 8 .Os .Sh NAME @@ -67,6 +67,10 @@ .Op Fl f .Ar device .Nm +.Cm freeze +.Nm +.Cm thaw +.Nm .Cm reset .Op Fl d .Ar device @@ -170,6 +174,23 @@ the device will be deleted even if it is physically present. This command should be used with care as a device that is deleted but present can no longer be used unless the parent bus device rediscovers the device via a rescan request. +.It Cm freeze +Freeze probe and attach processing initiated in response to drivers being +loaded. +Drivers are placed on a +.Do +frozen list +.Dc +and processed when a later +.Do +thaw +.Dc +occurs. +.It Cm thaw +Resume (thaw the freeze) probe and attach initiated in response to drivers +being loaded. +In addition to resuming, all pending actions that were frozen during the freeze +are performed. .It Xo Cm reset .Op Fl d .Ar device ___ dev-commits-src-main@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
git: 847b7d505490 - main - Fix test case header function name
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=847b7d505490ae407a5c876e14e7788a4add7737
commit 847b7d505490ae407a5c876e14e7788a4add7737
Author: Math Ieu
AuthorDate: 2021-06-02 04:09:55 +
Commit: Li-Wen Hsu
CommitDate: 2021-06-02 04:13:57 +
Fix test case header function name
This restores the expected behavior (skip) when running with non-root user
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D30584
---
usr.sbin/jail/tests/jail_basic_test.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.sbin/jail/tests/jail_basic_test.sh
b/usr.sbin/jail/tests/jail_basic_test.sh
index f9d52cf8a780..ba691cb9b05a 100755
--- a/usr.sbin/jail/tests/jail_basic_test.sh
+++ b/usr.sbin/jail/tests/jail_basic_test.sh
@@ -99,7 +99,7 @@ nested_cleanup()
jail -r basejail_nochild
}
-commands_header()
+commands_head()
{
atf_set descr 'Commands jail test'
atf_set require.user root
___
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
git: dad71022bd7a - main - Disable flaky test lib.libc.sys.setrlimit_test.setrlimit_stack
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=dad71022bd7a8f95ab2ba656bec61e2424a1c3c5
commit dad71022bd7a8f95ab2ba656bec61e2424a1c3c5
Author: Li-Wen Hsu
AuthorDate: 2021-11-28 06:58:21 +
Commit: Li-Wen Hsu
CommitDate: 2021-11-28 06:58:21 +
Disable flaky test lib.libc.sys.setrlimit_test.setrlimit_stack
PR: 259969
Sponsored by: The FreeBSD Foundation
---
contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c
b/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c
index 6b90deab8f3f..d5c50155e6dd 100644
--- a/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c
+++ b/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c
@@ -550,6 +550,9 @@ ATF_TC_BODY(setrlimit_stack, tc)
{
struct rlimit res;
+ if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false))
+ atf_tc_skip("https://bugs.freebsd.org/259969";);
+
/* Ensure soft limit is not bigger than hard limit */
res.rlim_cur = res.rlim_max = 4192256;
ATF_REQUIRE(setrlimit(RLIMIT_STACK, &res) == 0);
git: 71779dddffe5 - main - libefivar(3): efi_set_variables_supported.3 should be efi_variables_supported.3
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=71779dddffe5e860118f42739ff8d51d181272ce
commit 71779dddffe5e860118f42739ff8d51d181272ce
Author: Li-Wen Hsu
AuthorDate: 2021-12-21 12:42:39 +
Commit: Li-Wen Hsu
CommitDate: 2021-12-21 12:42:39 +
libefivar(3): efi_set_variables_supported.3 should be
efi_variables_supported.3
MFC after: 3 days
---
ObsoleteFiles.inc | 3 +++
lib/libefivar/Makefile | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index fa7c895e0b92..4e99c917e89a 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -40,6 +40,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20211221 efi_set_variables_supported.3 should be efi_variables_supported.3
+OLD_FILES+=usr/share/man/man3/efi_set_variables_supported.3.gz
+
# 20211218 meteor.4 removed, see also 20200301 entry below
OLD_FILES+=usr/share/man/man4/meteor.4.gz
diff --git a/lib/libefivar/Makefile b/lib/libefivar/Makefile
index 7b814898721f..5a6077d4b8f8 100644
--- a/lib/libefivar/Makefile
+++ b/lib/libefivar/Makefile
@@ -45,7 +45,7 @@ CFLAGS+= -I${EFIBOOT}/include
CFLAGS+= -I${.CURDIR} -I${EDK2INC}
CFLAGS+= -fno-strict-aliasing
-MLINKS+=efivar.3 efi_set_variables_supported.3 \
+MLINKS+=efivar.3 efi_variables_supported.3 \
efivar.3 efi_del_variable.3 \
efivar.3 efi_get_variable.3 \
efivar.3 efi_get_variable_attributes.3 \
git: 5282ada06bbc - main - ObsoleteFiles: Complete 20201025: Remove cal data files
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=5282ada06bbc6727b467d6f6530fa19114143c61 commit 5282ada06bbc6727b467d6f6530fa19114143c61 Author: Li-Wen Hsu AuthorDate: 2023-05-04 04:28:52 + Commit: Li-Wen Hsu CommitDate: 2023-05-04 04:28:52 + ObsoleteFiles: Complete 20201025: Remove cal data files Fixes: d20d6550187a calendar: remove all datafiles except freebsd one MFC after: 3 days --- ObsoleteFiles.inc | 12 1 file changed, 12 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 6e7c5205a2bf..ede2871455ae 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -6199,6 +6199,18 @@ OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.all OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.holiday OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.misc OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.orthodox +OLD_DIRS+=usr/share/calendar/de_AT.ISO_8859-15 +OLD_DIRS+=usr/share/calendar/de_DE.ISO8859-1 +OLD_FILES+=usr/share/calendar/de_DE.ISO8859-15 +OLD_DIRS+=usr/share/calendar/fr_FR.ISO8859-1 +OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-15 +OLD_DIRS+=usr/share/calendar/hr_HR.ISO8859-2 +OLD_DIRS+=usr/share/calendar/hu_HU.ISO8859-2 +OLD_DIRS+=usr/share/calendar/pt_BR.ISO8859-1 +OLD_DIRS+=usr/share/calendar/pt_BR.UTF-8 +OLD_DIRS+=usr/share/calendar/ru_RU.KOI8-R +OLD_DIRS+=usr/share/calendar/ru_RU.UTF-8 +OLD_DIRS+=usr/share/calendar/uk_UA.KOI8-U # 20201004: logo files renamed to type-agnostic gfx-*.lua OLD_FILES+=boot/lua/logo-beastie.lua
Re: git: 4849767cb16a - main - md5: Improve compatibility.
On Mon, May 8, 2023 at 4:05 PM Dag-Erling Smørgrav wrote:
>
> The branch main has been updated by des:
>
> URL:
> https://cgit.FreeBSD.org/src/commit/?id=4849767cb16a4dbd4d1b923db25d34029c09e7b0
>
> commit 4849767cb16a4dbd4d1b923db25d34029c09e7b0
> Author: Dag-Erling Smørgrav
> AuthorDate: 2023-05-08 06:56:09 +
> Commit: Dag-Erling Smørgrav
> CommitDate: 2023-05-08 06:56:22 +
>
> md5: Improve compatibility.
>
> * Overhaul the GNU compatibility mode to more closely emulate what the
> GNU tools do.
>
> * Add a Perl compatibility mode which emulates the shasum tool that ships
> with Perl. This is currently not installed.
>
> * Overhaul the tests.
>
> Sponsored by: Klara, Inc.
> Reviewed by:kevans
> Differential Revision: https://reviews.freebsd.org/D39446
gcc12 reports:
/workspace/src/sbin/md5/md5.c: In function 'MDInput':
/workspace/src/sbin/md5/md5.c:737:17: error: comparison of unsigned
expression in '< 0' is always false [-Werror=type-limits]
737 | if (len < 0) {
| ^
(From https://ci.freebsd.org/job/FreeBSD-main-amd64-gcc12_build/950/console )
Not sure if this can be changed to `len <= 0`, or just remove this
part. Can you check it? Thanks!
Best,
Li-Wen
git: fec74220377a - main - Complete removing twe(4)
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=fec74220377aa31af80945782bcb5b30f32a0378 commit fec74220377aa31af80945782bcb5b30f32a0378 Author: Li-Wen Hsu AuthorDate: 2023-05-11 08:28:23 + Commit: Li-Wen Hsu CommitDate: 2023-05-11 08:28:23 + Complete removing twe(4) Fixes: 062a7b918fac twe: Remove driver --- sys/i386/conf/GENERIC | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 1bc278194597..105bc238cb7d 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -167,7 +167,6 @@ device mfi # LSI MegaRAID SAS device mlx # Mylex DAC960 family device mrsas # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s device pst # Promise Supertrak SX6000 -device twe # 3ware ATA RAID # NVM Express (NVMe) support device nvme# base NVMe driver
git: 7e49aa86a282 - main - ifconfig(8): Teach ifconfig to attach and run itself in a jail
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=7e49aa86a2824e76e9d9becf61db12066bc0d79d
commit 7e49aa86a2824e76e9d9becf61db12066bc0d79d
Author: Yan Ka Chiu
AuthorDate: 2023-05-23 20:39:22 +
Commit: Li-Wen Hsu
CommitDate: 2023-05-23 20:39:22 +
ifconfig(8): Teach ifconfig to attach and run itself in a jail
Add -j flag to ifconfig to allow ifconfig to attach and run inside a
jail. This allow parent to configure network interfaces of its children
even if ifconfig is not available in child's tree (e.g. Linux Jails)
Reviewed by:emaste, khng, melifaro
Event: Kitchener-Waterloo Hackathon 202305
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D40213
---
sbin/ifconfig/ifconfig.8 | 24 +++-
sbin/ifconfig/ifconfig.c | 38 +++---
sbin/ifconfig/ifconfig.h | 1 +
3 files changed, 55 insertions(+), 8 deletions(-)
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 4669e96e28e6..a7e1bb26d81a 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -28,7 +28,7 @@
.\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94
.\" $FreeBSD$
.\"
-.Dd March 6, 2023
+.Dd May 22, 2023
.Dt IFCONFIG 8
.Os
.Sh NAME
@@ -36,6 +36,7 @@
.Nd configure network interface parameters
.Sh SYNOPSIS
.Nm
+.Op Fl j Ar jail
.Op Fl kLmn
.Op Fl f Ar type Ns Cm \&: Ns Ar format
.Ar interface
@@ -49,9 +50,11 @@
.Oc
.Op Ar parameters
.Nm
+.Op Fl j Ar jail
.Ar interface
.Cm destroy
.Nm
+.Op Fl j Ar jail
.Fl a
.Op Fl dkLmuv
.Op Fl f Ar type Ns Cm \&: Ns Ar format
@@ -61,13 +64,16 @@
.Nm
.Fl C
.Nm
+.Op Fl j Ar jail
.Fl g Ar groupname
.Nm
+.Op Fl j Ar jail
.Fl l
.Op Fl du
.Op Fl g Ar groupname
.Op Ar address_family
.Nm
+.Op Fl j Ar jail
.Op Fl dkLmuv
.Op Fl f Ar type Ns Cm \&: Ns Ar format
.Sh DESCRIPTION
@@ -233,6 +239,22 @@ Setting
to
.Cm all
selects all interfaces.
+.It Fl j Ar jail
+Perform the actions inside the
+.Ar jail .
+.Pp
+The
+.Cm ifconfig
+will first attach to the
+.Ar jail
+(by jail id or jail name) before performing the effects.
+.Pp
+This allow network interfaces of
+.Ar jail
+to be configured even if the
+.Cm ifconfig
+binary is not available in
+.Ar jail .
.It Fl k
Print keying information for the
.Ar interface ,
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index c5e7b7befc72..e1467e661657 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -42,6 +42,9 @@ static const char rcsid[] =
#include
#include
+#ifdef JAIL
+#include
+#endif
#include
#include
#include
@@ -184,12 +187,12 @@ usage(void)
}
fprintf(stderr,
- "usage: ifconfig [-f type:format] %sinterface address_family\n"
+ "usage: ifconfig [-j jail] [-f type:format] %sinterface
address_family\n"
"[address [dest_address]] [parameters]\n"
- " ifconfig interface create\n"
- " ifconfig -a %s[-d] [-m] [-u] [-v] [address_family]\n"
- " ifconfig -l [-d] [-u] [address_family]\n"
- " ifconfig %s[-d] [-m] [-u] [-v]\n",
+ " ifconfig [-j jail] interface create\n"
+ " ifconfig [-j jail] -a %s[-d] [-m] [-u] [-v] [address_family]\n"
+ " ifconfig [-j jail] -l [-d] [-u] [address_family]\n"
+ " ifconfig [-j jail] %s[-d] [-m] [-u] [-v]\n",
options, options, options);
exit(1);
}
@@ -437,7 +440,7 @@ args_parse(struct ifconfig_args *args, int argc, char
*argv[])
int c;
/* Parse leading line options */
- strlcpy(options, "G:adf:klmnuv", sizeof(options));
+ strlcpy(options, "G:adf:j:klmnuv", sizeof(options));
for (p = opts; p != NULL; p = p->next)
strlcat(options, p->opt, sizeof(options));
while ((c = getopt(argc, argv, options)) != -1) {
@@ -458,6 +461,15 @@ args_parse(struct ifconfig_args *args, int argc, char
*argv[])
usage();
args->nogroup = optarg;
break;
+ case 'j':
+#ifdef JAIL
+ if (optarg == NULL)
+ usage();
+ args->jail_name = optarg;
+#else
+ Perror("not built with jail support");
+#endif
+ break;
case 'k':
args->printkeys = true;
break;
@@ -547,7 +559,9 @@ main(int ac, char *av[])
char *envformat;
size_t iflen;
int flags;
-
+#ifdef JAIL
+ int jid;
+#endif
f_inet = f_inet6 = f_ether = f_addr = NULL;
lifh = ifconfig_open();
git: b80572fe3b3a - main - libc/locale tests: temporarily skip lib.libc.locale.c16rtomb_test.c16rtomb_utf_8_test
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=b80572fe3b3a93e0490c90901c7e5336f0210303
commit b80572fe3b3a93e0490c90901c7e5336f0210303
Author: Li-Wen Hsu
AuthorDate: 2022-08-16 05:18:15 +
Commit: Li-Wen Hsu
CommitDate: 2022-08-16 05:18:15 +
libc/locale tests: temporarily skip
lib.libc.locale.c16rtomb_test.c16rtomb_utf_8_test
This test case starts failing after iconv changes on 2022-08-11.
PR: 265871
Sponsored by: The FreeBSD Foundation
---
lib/libc/tests/locale/c16rtomb_test.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/libc/tests/locale/c16rtomb_test.c
b/lib/libc/tests/locale/c16rtomb_test.c
index ea1f64f7d308..7356e69f82f6 100644
--- a/lib/libc/tests/locale/c16rtomb_test.c
+++ b/lib/libc/tests/locale/c16rtomb_test.c
@@ -127,6 +127,9 @@ ATF_TC_WITHOUT_HEAD(c16rtomb_utf_8_test);
ATF_TC_BODY(c16rtomb_utf_8_test, tc)
{
+ if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false))
+ atf_tc_skip("https://bugs.freebsd.org/265871";);
+
require_lc_ctype("en_US.UTF-8");
/* Unicode character 'Pile of poo'. */
git: c04721e35ff0 - main - basic_signal test: temporarily skip trap_signal_test on i386
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c04721e35ff0e8220c88d5b10f068dba18629f7e
commit c04721e35ff0e8220c88d5b10f068dba18629f7e
Author: Li-Wen Hsu
AuthorDate: 2022-08-16 22:03:37 +
Commit: Li-Wen Hsu
CommitDate: 2022-08-16 22:03:37 +
basic_signal test: temporarily skip trap_signal_test on i386
This case crashes a bhyve VM.
PR: 265889
Sponsored by: The FreeBSD Foundation
---
tests/sys/kern/basic_signal.c | 4
1 file changed, 4 insertions(+)
diff --git a/tests/sys/kern/basic_signal.c b/tests/sys/kern/basic_signal.c
index 1dcb9ff064fc..be37b0137151 100644
--- a/tests/sys/kern/basic_signal.c
+++ b/tests/sys/kern/basic_signal.c
@@ -164,6 +164,10 @@ ATF_TC_HEAD(signal_test_T32_to_A32, tc)
t32_isa ATF_TC_BODY(signal_test_T32_to_A32, tc)
{
+#if defined(__i386__)
+ if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false))
+ atf_tc_skip("https://bugs.freebsd.org/265889";);
+#endif
/*
* Setup the signal handlers
*/
git: beeeb40bca06 - main - basic_signal test: really skip trap_signal_test on i386
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=beeeb40bca06c8ebc8953274bbc5759fb432fab2
commit beeeb40bca06c8ebc8953274bbc5759fb432fab2
Author: Li-Wen Hsu
AuthorDate: 2022-08-17 00:15:10 +
Commit: Li-Wen Hsu
CommitDate: 2022-08-17 00:15:10 +
basic_signal test: really skip trap_signal_test on i386
PR: 265889
Fixes: c04721e35ff0e8220c88d5b10f068dba18629f7e
Sponsored by: The FreeBSD Foundation
---
tests/sys/kern/basic_signal.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/sys/kern/basic_signal.c b/tests/sys/kern/basic_signal.c
index be37b0137151..0183d117fdb4 100644
--- a/tests/sys/kern/basic_signal.c
+++ b/tests/sys/kern/basic_signal.c
@@ -106,6 +106,10 @@ ATF_TC_HEAD(trap_signal_test, tc)
ATF_TC_BODY(trap_signal_test, tc)
{
+#if defined(__i386__)
+ if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false))
+ atf_tc_skip("https://bugs.freebsd.org/265889";);
+#endif
/*
* Setup the signal handlers
*/
@@ -164,10 +168,6 @@ ATF_TC_HEAD(signal_test_T32_to_A32, tc)
t32_isa ATF_TC_BODY(signal_test_T32_to_A32, tc)
{
-#if defined(__i386__)
- if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false))
- atf_tc_skip("https://bugs.freebsd.org/265889";);
-#endif
/*
* Setup the signal handlers
*/
git: 2541dcaf4430 - main - development(7): Update URLs
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=2541dcaf4430a7d732c73b8f9190791e85c79b1c commit 2541dcaf4430a7d732c73b8f9190791e85c79b1c Author: Li-Wen Hsu AuthorDate: 2022-08-18 01:24:53 + Commit: Li-Wen Hsu CommitDate: 2022-08-18 01:24:53 + development(7): Update URLs MFC after: 3 days Sponsored by: The FreeBSD Foundation --- share/man/man7/development.7 | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share/man/man7/development.7 b/share/man/man7/development.7 index 346772b4fbb0..e0a0a536fc48 100644 --- a/share/man/man7/development.7 +++ b/share/man/man7/development.7 @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 21, 2022 +.Dd August 18, 2022 .Dt DEVELOPMENT 7 .Os .Sh NAME @@ -39,14 +39,14 @@ Doc is the documentation, such as the Handbook. To read more, see: .Pp -.Lk https://www.FreeBSD.org/doc/en/books/fdp-primer/ +.Lk https://docs.FreeBSD.org/en/books/fdp-primer/ .Pp Ports, described further in .Xr ports 7 , are the way to build, package, and install third party software. To read more, see: .Pp -.Lk https://www.FreeBSD.org/doc/en/books/porters-handbook/ +.Lk https://docs.FreeBSD.org/en/books/porters-handbook/ .Pp The last one, src, revolves around the source code for the base system, consisting of the kernel, and the libraries and utilities commonly called @@ -55,7 +55,7 @@ the world. The Committer's Guide, describing topics relevant to all committers, can be found at: .Pp -.Lk https://www.FreeBSD.org/doc/en/articles/committers-guide/ +.Lk https://docs.freebsd.org/en/articles/committers-guide/ .Pp .Fx src development takes place in the project-hosted @@ -69,7 +69,7 @@ The push URL is: .Pp There is also a list of public, read-only Git mirrors at: .Pp -.Lk https://docs.freebsd.org/en/books/handbook/mirrors/#external-mirrors +.Lk https://docs.FreeBSD.org/en/books/handbook/mirrors/#external-mirrors .Pp The .Ql main
git: 504b998defe7 - main - ObsoleteFiles: Follow awk test files move
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=504b998defe7305a1a70a2102f70b05e90761659 commit 504b998defe7305a1a70a2102f70b05e90761659 Author: Li-Wen Hsu AuthorDate: 2022-08-25 03:28:57 + Commit: Li-Wen Hsu CommitDate: 2022-08-25 03:28:57 + ObsoleteFiles: Follow awk test files move Fixes: 517e52b6c21ccff22c46df0dcd15c19baee3d86c Sponsored by: The FreeBSD Foundation --- ObsoleteFiles.inc | 26 ++ 1 file changed, 26 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 66aa0c9c807d..68d832e8a507 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,32 @@ # xargs -n1 | sort | uniq -d; # done +# 20220825: awk tests moved to subdirs +OLD_FILES+=usr/tests/usr.bin/awk/awk_test +OLD_FILES+=usr/tests/usr.bin/awk/d_assign_NF.awk +OLD_FILES+=usr/tests/usr.bin/awk/d_assign_NF.in +OLD_FILES+=usr/tests/usr.bin/awk/d_assign_NF.out +OLD_FILES+=usr/tests/usr.bin/awk/d_big_regexp.awk +OLD_FILES+=usr/tests/usr.bin/awk/d_big_regexp.in +OLD_FILES+=usr/tests/usr.bin/awk/d_big_regexp.out +OLD_FILES+=usr/tests/usr.bin/awk/d_end1.awk +OLD_FILES+=usr/tests/usr.bin/awk/d_end1.in +OLD_FILES+=usr/tests/usr.bin/awk/d_end1.out +OLD_FILES+=usr/tests/usr.bin/awk/d_end2.awk +OLD_FILES+=usr/tests/usr.bin/awk/d_end2.in +OLD_FILES+=usr/tests/usr.bin/awk/d_end2.out +OLD_FILES+=usr/tests/usr.bin/awk/d_period.awk +OLD_FILES+=usr/tests/usr.bin/awk/d_period.in +OLD_FILES+=usr/tests/usr.bin/awk/d_period.out +OLD_FILES+=usr/tests/usr.bin/awk/d_string1.awk +OLD_FILES+=usr/tests/usr.bin/awk/d_string1.out +OLD_FILES+=usr/tests/usr.bin/awk/d_tolower.awk +OLD_FILES+=usr/tests/usr.bin/awk/d_tolower.in +OLD_FILES+=usr/tests/usr.bin/awk/d_tolower.out +OLD_FILES+=usr/tests/usr.bin/awk/d_toupper.awk +OLD_FILES+=usr/tests/usr.bin/awk/d_toupper.in +OLD_FILES+=usr/tests/usr.bin/awk/d_toupper.out + # 20220820: remove knlist_init_rw_reader() OLD_FILES+=usr/share/man/man9/knlist_init_rw_reader.9.gz
git: 9ea2716b7758 - main - Reenable basic_signal:trap_signal_test on i386
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=9ea2716b7758b72725b932f1ad9f3457a69cbea6
commit 9ea2716b7758b72725b932f1ad9f3457a69cbea6
Author: Li-Wen Hsu
AuthorDate: 2022-08-25 04:09:00 +
Commit: Li-Wen Hsu
CommitDate: 2022-08-25 04:09:00 +
Reenable basic_signal:trap_signal_test on i386
This is fixed in dc4a2d1d0e838579f21d9d1fef8655f902f06ab2
PR: 265889
Sponsored by: The FreeBSD Foundation
MFC with: dc4a2d1d0e838579f21d9d1fef8655f902f06ab2
---
tests/sys/kern/basic_signal.c | 4
1 file changed, 4 deletions(-)
diff --git a/tests/sys/kern/basic_signal.c b/tests/sys/kern/basic_signal.c
index 0183d117fdb4..1dcb9ff064fc 100644
--- a/tests/sys/kern/basic_signal.c
+++ b/tests/sys/kern/basic_signal.c
@@ -106,10 +106,6 @@ ATF_TC_HEAD(trap_signal_test, tc)
ATF_TC_BODY(trap_signal_test, tc)
{
-#if defined(__i386__)
- if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false))
- atf_tc_skip("https://bugs.freebsd.org/265889";);
-#endif
/*
* Setup the signal handlers
*/
git: 751ec8af5ea1 - main - mpr(4): Add Aero/Sea devices to supported hardware list
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=751ec8af5ea1df5a4eadd1f3e7d76271fcfed0b1 commit 751ec8af5ea1df5a4eadd1f3e7d76271fcfed0b1 Author: Sreekanth Reddy AuthorDate: 2022-10-18 12:34:13 + Commit: Li-Wen Hsu CommitDate: 2022-10-18 13:12:26 + mpr(4): Add Aero/Sea devices to supported hardware list Add Aero/Sea devices to supported hardware list in mpr man page. PR: 267172 MFC after: 3 days --- share/man/man4/mpr.4 | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/share/man/man4/mpr.4 b/share/man/man4/mpr.4 index 3cc516397e33..e6bd863dfe35 100644 --- a/share/man/man4/mpr.4 +++ b/share/man/man4/mpr.4 @@ -2,7 +2,7 @@ .\" Copyright (c) 2010 Spectra Logic Corporation .\" Copyright (c) 2014 LSI Corp .\" Copyright (c) 2015-2017 Avago Technologies -.\" Copyright (c) 2015-2017 Broadcom Ltd. +.\" Copyright (c) 2015-2022 Broadcom Ltd. .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -99,6 +99,10 @@ Broadcom Ltd./Avago Tech (LSI) SAS 3616 (16 Port SAS/PCIe) Broadcom Ltd./Avago Tech (LSI) SAS 3708 (8 Port SAS/PCIe) .It Broadcom Ltd./Avago Tech (LSI) SAS 3716 (16 Port SAS/PCIe) +.It +Broadcom Ltd./Avago Tech (LSI) SAS 3816 (16 Port SAS/PCIe) +.It +Broadcom Ltd./Avago Tech (LSI) SAS 3916 (16 Port SAS/PCIe) .El .Sh CONFIGURATION In all tunable descriptions below, X represents the adapter number.
git: c711f3b45370 - main - release/azure: Don't use azure-agent deprovision to build image
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c711f3b453703824c40bec1896d79ddcbd901781
commit c711f3b453703824c40bec1896d79ddcbd901781
Author: Li-Wen Hsu
AuthorDate: 2022-11-03 19:17:43 +
Commit: Li-Wen Hsu
CommitDate: 2022-11-03 19:17:43 +
release/azure: Don't use azure-agent deprovision to build image
Deprovision feature of waagent is used for preparing to capture a
running VM and turn it into a VM image. Using it in the process of
building a VM image from scratch will cause some side effects such as
the hostname of the building host getting reset.
Remove calling the deprovision command and use a simpler way to fulfill
the requirements of the Azure VM image.
Sponsored by: The FreeBSD Foundation
---
release/tools/azure.conf | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/release/tools/azure.conf b/release/tools/azure.conf
index a9126ed8c389..dd43260201aa 100644
--- a/release/tools/azure.conf
+++ b/release/tools/azure.conf
@@ -20,17 +20,19 @@ export NOSWAP=YES
export VM_BOOTPARTSOFFSET=1M
vm_extra_pre_umount() {
+ mount -t devfs devfs ${DESTDIR}/dev
+
# The firstboot_pkgs rc.d script will download the repository
# catalogue and install or update pkg when the instance first
# launches, so these files would just be replaced anyway; removing
# them from the image allows it to boot faster.
- mount -t devfs devfs ${DESTDIR}/dev
chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
/usr/sbin/pkg delete -f -y pkg
- umount ${DESTDIR}/dev
rm ${DESTDIR}/var/db/pkg/repo-*.sqlite
- yes | chroot ${DESTDIR} ${EMULATOR} /usr/local/sbin/waagent -deprovision
+ chroot ${DESTDIR} ${EMULATOR} pw usermod root -h -
+
+ umount ${DESTDIR}/dev
cat << EOF >> ${DESTDIR}/etc/rc.conf
ifconfig_hn0="SYNCDHCP"
git: d0b5e4a30ac9 - main - mana(4): Make the code cross-platform
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=d0b5e4a30ac985051c14b0f5e3cb3e6cdd271929
commit d0b5e4a30ac985051c14b0f5e3cb3e6cdd271929
Author: Li-Wen Hsu
AuthorDate: 2022-11-04 03:45:35 +
Commit: Li-Wen Hsu
CommitDate: 2022-11-04 03:45:35 +
mana(4): Make the code cross-platform
Discussed with: whu
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D36388
---
sys/dev/mana/mana_en.c | 15 +++
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c
index 5e5e3939753f..5a95eff66ab6 100644
--- a/sys/dev/mana/mana_en.c
+++ b/sys/dev/mana/mana_en.c
@@ -1054,10 +1054,8 @@ mana_cfg_vport(struct mana_port_context *apc, uint32_t
protection_dom_id,
apc->tx_shortform_allowed = resp.short_form_allowed;
apc->tx_vp_offset = resp.tx_vport_offset;
-#if defined(__amd64__)
- if_printf(apc->ndev, "Configured vPort %lu PD %u DB %u\n",
+ if_printf(apc->ndev, "Configured vPort %ju PD %u DB %u\n",
apc->port_handle, protection_dom_id, doorbell_pg_id);
-#endif
out:
if (err)
@@ -1127,10 +1125,8 @@ mana_cfg_vport_steering(struct mana_port_context *apc,
err = EPROTO;
}
-#if defined(__amd64__)
- if_printf(ndev, "Configured steering vPort %lu entries %u\n",
+ if_printf(ndev, "Configured steering vPort %ju entries %u\n",
apc->port_handle, num_entries);
-#endif
out:
free(req, M_DEVBUF);
@@ -1694,13 +1690,8 @@ mana_process_rx_cqe(struct mana_rxq *rxq, struct mana_cq
*cq,
if (pktlen == 0) {
/* data packets should never have packetlength of zero */
-#if defined(__amd64__)
- if_printf(ndev, "RX pkt len=0, rq=%u, cq=%u, rxobj=0x%lx\n",
+ if_printf(ndev, "RX pkt len=0, rq=%u, cq=%u, rxobj=0x%jx\n",
rxq->gdma_id, cq->gdma_id, rxq->rxobj);
-#else
- if_printf(ndev, "RX pkt len=0, rq=%u, cq=%u, rxobj=0x%llx\n",
- rxq->gdma_id, cq->gdma_id, rxq->rxobj);
-#endif
return;
}
git: 72a1cb05cd23 - main - rc(8): Add a zpoolupgrade rc.d script
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=72a1cb05cd230ce0d12a7180ae65ddbba2e0cb6d
commit 72a1cb05cd230ce0d12a7180ae65ddbba2e0cb6d
Author: Li-Wen Hsu
AuthorDate: 2022-11-07 03:30:09 +
Commit: Li-Wen Hsu
CommitDate: 2022-11-07 03:30:09 +
rc(8): Add a zpoolupgrade rc.d script
If a zpool is created by makefs(8), its version is 5000, i.e., all
feature flags are off. Introduce an rc script to run `zpool upgrade`
over the assigned zpools on the first boot. This is useful to the
ZFS based VM images built from release(7).
Reviewed by:imp, markj, mav
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D37282
---
libexec/rc/rc.conf | 2 ++
libexec/rc/rc.d/Makefile | 1 +
libexec/rc/rc.d/zpoolupgrade | 25 +
share/man/man5/rc.conf.5 | 9 -
4 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf
index bc908075d033..a71a3fa4063d 100644
--- a/libexec/rc/rc.conf
+++ b/libexec/rc/rc.conf
@@ -77,6 +77,8 @@ zfskeys_enable="NO" # Set YES to autoload ZFS encryption
keys
zfs_bootonce_activate="NO" # Set YES to make successful bootonce BE permanent
zpool_reguid=""# Set to zpools for which the GUID should be
replaced
# upon first boot.
+zpool_upgrade="" # Set to zpools for which the version should be upgraded
+ # upon first boot.
# ZFSD support
zfsd_enable="NO" # Set to YES to automatically start the ZFS fault
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
index e8ee61ffdff8..0f0d87bdde80 100644
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -328,6 +328,7 @@ ZFS+= zfsd
ZFS+= zfskeys
ZFS+= zpool
ZFS+= zpoolreguid
+ZFS+= zpoolupgrade
ZFS+= zvol
ZFSPACKAGE=rc
.endif
diff --git a/libexec/rc/rc.d/zpoolupgrade b/libexec/rc/rc.d/zpoolupgrade
new file mode 100755
index ..6f5720bac6a7
--- /dev/null
+++ b/libexec/rc/rc.d/zpoolupgrade
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# PROVIDE: zpoolupgrade
+# REQUIRE: zpool
+# BEFORE: mountcritlocal
+# KEYWORD: firstboot nojail
+
+. /etc/rc.subr
+
+name="zpoolupgrade"
+desc="Upgrade zpool version"
+rcvar="zfs_enable"
+start_cmd="zpoolupgrade_start"
+
+zpoolupgrade_start()
+{
+ local pool
+
+ for pool in ${zpool_upgrade}; do
+ zpool upgrade $pool
+ done
+}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index f9ceabc83120..43fa44a5f1cb 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd August 28, 2022
+.Dd November 7, 2022
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -2109,6 +2109,13 @@ A space-separated list of ZFS pool names for which new
pool GUIDs should be
assigned upon first boot.
This is useful when using a ZFS pool copied from a template, such as a virtual
machine image.
+.It Va zpool_upgrade
+.Pq Vt str
+A space-separated list of ZFS pool names for which version should be upgraded
+upon first boot.
+This is useful when using a ZFS pool generated by
+.Xr makefs 8
+utility.
.It Va gptboot_enable
.Pq Vt bool
If set to
git: 3bf53c4c8f53 - main - release(7): Enable zpoolupgrade rc script in ZFS based VM images
The branch main has been updated by lwhsu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=3bf53c4c8f53b1f19313e9c31415c7eee830cdc0
commit 3bf53c4c8f53b1f19313e9c31415c7eee830cdc0
Author: Li-Wen Hsu
AuthorDate: 2022-11-07 03:47:33 +
Commit: Li-Wen Hsu
CommitDate: 2022-11-07 03:47:33 +
release(7): Enable zpoolupgrade rc script in ZFS based VM images
This will enable VM access to all ZFS feature automatically, only on a
newly installed or provisioned VM or cloud instance.
Reviewed by:markj
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D37283
---
release/tools/vmimage.subr | 1 +
1 file changed, 1 insertion(+)
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index 8982e768527a..a65ec4f1a1f9 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -83,6 +83,7 @@ vm_install_base() {
if [ "${VMFS}" = zfs ]; then
echo "zfs_enable=\"YES\"" >> ${DESTDIR}/etc/rc.conf
echo "zpool_reguid=\"zroot\"" >> ${DESTDIR}/etc/rc.conf
+ echo "zpool_upgrade=\"zroot\"" >> ${DESTDIR}/etc/rc.conf
fi
if ! [ -z "${QEMUSTATIC}" ]; then
