Page MenuHomeFreeBSD
Files F164276828

D58391.id182668.diff
No OneTemporary
Actions

D58391.id182668.diff
View Options

diff --git a/UPDATING b/UPDATING
--- a/UPDATING
+++ b/UPDATING
@@ -27,6 +27,18 @@
world, or to merely disable the most expensive debugging functionality
at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20260722:
+ The wait_for_pids() function in rc.subr, used by rc scripts
+ when stopping or restarting a service, has been modified to
+ use pwait(1)'s new -r option, which requires kernel support.
+ When upgrading across this change, you should install a new
+ kernel first, then reboot, then install a new world, run
+ etcupdate, and reboot again. Otherwise, you may find that
+ rc.subr is unable to stop services because the running kernel
+ does not provide the support that the updated pwait(1) needs.
+ Alternatively, if you deem it safe, you may use fastboot(8) to
+ reboot without shutting down services first.
+
20260620:
On powerpc64le, long double is now IEEE 754 binary128 (quad
precision, 113-bit mantissa) instead of 64-bit double. This is an
diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr
--- a/libexec/rc/rc.subr
+++ b/libexec/rc/rc.subr
@@ -803,7 +803,7 @@
#
wait_for_pids()
{
- local _list _prefix _j
+ local _list= _prefix= _j=
for _j in "$@"; do
if kill -0 $_j 2>/dev/null; then
@@ -814,7 +814,7 @@
while [ -n "$_list" ]; do
echo -n ${_prefix:-"Waiting for PIDS: "}$_list
_prefix=", "
- _list=$(pwait -op $_list 2>/dev/null)
+ _list=$(pwait -opr $_list 2>/dev/null)
done
if [ -n "$_prefix" ]; then
echo "."
diff --git a/libexec/rc/tests/rc_subr_test.sh b/libexec/rc/tests/rc_subr_test.sh
--- a/libexec/rc/tests/rc_subr_test.sh
+++ b/libexec/rc/tests/rc_subr_test.sh
@@ -123,20 +123,12 @@
}
wait_for_pids_progress_body()
{
- cat >>script <<'EOF'
-. /etc/rc.subr
-sleep 15 &
-a=$!
-sleep 10 &
-b=$!
-sleep 5 &
-c=$!
-wait_for_pids $a $b $c
-EOF
- re="^Waiting for PIDS: [0-9]+ [0-9]+ [0-9]+"
- re="${re}, [0-9]+ [0-9]+"
- re="${re}, [0-9]+\.$"
- atf_check -s exit:0 -o match:"${re}" /bin/sh script
+ a=$(sleep 4 >/dev/null & echo $!)
+ b=$(sleep 3 >/dev/null & echo $!)
+ c=$(sleep 2 >/dev/null & echo $!)
+ atf_check \
+ -o inline:"Waiting for PIDS: $a $b $c, $a $b, $a.\n" \
+ /bin/sh -c ". /etc/rc.subr; wait_for_pids $a $b $c"
}
atf_init_test_cases()

File Metadata

Mime Type
text/plain
Expires
Fri, Jul 31, 7:35 AM (9 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35580507
Default Alt Text
D58391.id182668.diff (2 KB)

Event Timeline