The MI boot code used to have an infinite loop trying to boot the kernel,

which got limited to at most two tries 26 years ago for the 2.3 release,
but the documentation was never updated to match this change. Do it now.

Reported by Nir Lichtman on tech@

6 files changed, 24 insertions, 18 deletions

diff --git a/sys/arch/alpha/stand/nboot/boot.8 b/sys/arch/alpha/stand/nboot/boot.8
index 9e8e970f553..b879756ea7c 100644
--- a/sys/arch/alpha/stand/nboot/boot.8
+++ b/sys/arch/alpha/stand/nboot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.2 2023/03/14 06:55:31 jmc Exp $
+.\"	$OpenBSD: boot.8,v 1.3 2024/11/05 09:42:48 miod Exp $
 .\"
 .\" Copyright (c) 1997-2001 Michael Shalayeff
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: March 14 2023 $
+.Dd $Mdocdate: November 5 2024 $
 .Dt BOOT 8 alpha
 .Os
 .Sh NAME
@@ -61,7 +61,8 @@ If time expires, the kernel will be loaded according to
 the current variable settings (see the
 .Ic set
 command).
-Each time a kernel load fails, the timeout is increased by one second.
+If the kernel load fails, a second attempt is made with the timeout increased
+by one second.
 The sequence of
 .Nm
 operations is as follows:
diff --git a/sys/arch/amd64/stand/boot/boot.8 b/sys/arch/amd64/stand/boot/boot.8
index cdeb55a3cc1..6c320252499 100644
--- a/sys/arch/amd64/stand/boot/boot.8
+++ b/sys/arch/amd64/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.35 2024/04/25 18:31:49 kn Exp $
+\"	$OpenBSD: boot.8,v 1.36 2024/11/05 09:42:48 miod Exp $
 .\"
 .\" Copyright (c) 1997-2001 Michael Shalayeff
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: April 25 2024 $
+.Dd $Mdocdate: November 5 2024 $
 .Dt BOOT 8 amd64
 .Os
 .Sh NAME
@@ -67,7 +67,8 @@ If time expires, the kernel will be loaded according to
 the current variable settings (see the
 .Ic set
 command).
-Each time a kernel load fails, the timeout is increased by one second.
+If the kernel load fails, a second attempt is made with the timeout increased
+by one second.
 The sequence of
 .Nm
 operations is as follows:
diff --git a/sys/arch/hppa/stand/boot/boot.8 b/sys/arch/hppa/stand/boot/boot.8
index 117f7b6ccbe..f9f754138da 100644
--- a/sys/arch/hppa/stand/boot/boot.8
+++ b/sys/arch/hppa/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.27 2023/02/23 19:48:22 miod Exp $
+.\"	$OpenBSD: boot.8,v 1.28 2024/11/05 09:42:48 miod Exp $
 .\"
 .\" Copyright (c) 2002 Miodrag Vallat
 .\" Copyright (c) 1997-2002 Michael Shalayeff
@@ -26,7 +26,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: February 23 2023 $
+.Dd $Mdocdate: November 5 2024 $
 .Dt BOOT 8 hppa
 .Os
 .Sh NAME
@@ -63,7 +63,8 @@ If time expires, the kernel will be loaded according to
 the current variable settings (see the
 .Nm set
 command).
-Each time a kernel load fails, the timeout is increased by one second.
+If the kernel load fails, a second attempt is made with the timeout increased
+by one second.
 The sequence of
 .Nm
 operations is as follows:
diff --git a/sys/arch/i386/stand/boot/boot.8 b/sys/arch/i386/stand/boot/boot.8
index 6d15b9d589a..aec14f5ac75 100644
--- a/sys/arch/i386/stand/boot/boot.8
+++ b/sys/arch/i386/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.68 2023/02/23 19:48:22 miod Exp $
+.\"	$OpenBSD: boot.8,v 1.69 2024/11/05 09:42:48 miod Exp $
 .\"
 .\" Copyright (c) 1997-2001 Michael Shalayeff
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: February 23 2023 $
+.Dd $Mdocdate: November 5 2024 $
 .Dt BOOT 8 i386
 .Os
 .Sh NAME
@@ -67,7 +67,8 @@ If time expires, the kernel will be loaded according to
 the current variable settings (see the
 .Ic set
 command).
-Each time a kernel load fails, the timeout is increased by one second.
+If the kernel load fails, a second attempt is made with the timeout increased
+by one second.
 The sequence of
 .Nm
 operations is as follows:
diff --git a/sys/arch/landisk/stand/boot/boot.8 b/sys/arch/landisk/stand/boot/boot.8
index 4e06cfa84d4..db4077dc1cc 100644
--- a/sys/arch/landisk/stand/boot/boot.8
+++ b/sys/arch/landisk/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.13 2023/02/23 19:48:22 miod Exp $
+.\"	$OpenBSD: boot.8,v 1.14 2024/11/05 09:42:48 miod Exp $
 .\"
 .\" Copyright (c) 1997-2001 Michael Shalayeff
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: February 23 2023 $
+.Dd $Mdocdate: November 5 2024 $
 .Dt BOOT 8 landisk
 .Os
 .Sh NAME
@@ -61,7 +61,8 @@ If time expires, the kernel will be loaded according to
 the current variable settings (see the
 .Ic set
 command).
-Each time a kernel load fails, the timeout is increased by one second.
+If the kernel load fails, a second attempt is made with the timeout increased
+by one second.
 The sequence of
 .Nm
 operations is as follows:
diff --git a/sys/arch/luna88k/stand/boot/boot.8 b/sys/arch/luna88k/stand/boot/boot.8
index b5c056a5930..0d8f0bf4c39 100644
--- a/sys/arch/luna88k/stand/boot/boot.8
+++ b/sys/arch/luna88k/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.2 2023/02/23 19:48:22 miod Exp $
+.\"	$OpenBSD: boot.8,v 1.3 2024/11/05 09:42:49 miod Exp $
 .\"
 .\" Copyright (c) 1997-2001 Michael Shalayeff
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: February 23 2023 $
+.Dd $Mdocdate: November 5 2024 $
 .Dt BOOT 8 luna88k
 .Os
 .Sh NAME
@@ -62,7 +62,8 @@ If time expires, the kernel will be loaded according to
 the current variable settings (see the
 .Ic set
 command).
-Each time a kernel load fails, the timeout is increased by one second.
+If the kernel load fails, a second attempt is made with the timeout increased
+by one second.
 The sequence of
 .Nm
 operations is as follows: