machdep.kbdreset enables a shutdown by Ctrl-Alt-Del on amd64 and

i386.  Stop abusing it on other archs for controling a shutdown by
pressing the soft power button:

* Add a MI sysctl hw.allowpowerdown; if set to 1 (the default) it
  allows a power button shutdown.
* Make acpi(4)/acpibtn(4) honor hw.allowpowerdown.
* Switch the various power button intercepts on landisk, sgi, sparc64
  and zaurus over to hw.allowpowerdown.
* Garbage collect the machdep.kbdreset sysctl on all archs other than
  amd64 and i386.

ok miod@

6 files changed, 30 insertions, 18 deletions

diff --git a/share/man/man4/acpibtn.4 b/share/man/man4/acpibtn.4
index 5a21f928dcf..a93e437813e 100644
--- a/share/man/man4/acpibtn.4
+++ b/share/man/man4/acpibtn.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: acpibtn.4,v 1.3 2007/05/31 19:19:48 jmc Exp $
+.\"	$OpenBSD: acpibtn.4,v 1.4 2011/06/24 19:47:48 naddy Exp $
 .\"
 .\" Copyright (c) 2006 Michael Knudsen <mk@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 24 2011 $
 .Dt ACPIBTN 4
 .Os
 .Sh NAME
@@ -29,7 +29,10 @@ driver is used to handle the event triggered when the user presses an ACPI
 button.
 Currently, the only event handled is the press of a power button which
 causes the system to perform a regular system shutdown and power off the
-machine.
+machine if the
+.Va hw.allowpowerdown
+.Xr sysctl 8
+is set to 1.
 .Sh SEE ALSO
 .Xr acpi 4 ,
 .Xr intro 4
diff --git a/share/man/man4/man4.landisk/power.4 b/share/man/man4/man4.landisk/power.4
index f33e9557f62..0ee69224bba 100644
--- a/share/man/man4/man4.landisk/power.4
+++ b/share/man/man4/man4.landisk/power.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: power.4,v 1.4 2007/05/31 19:19:55 jmc Exp $
+.\"     $OpenBSD: power.4,v 1.5 2011/06/24 19:47:48 naddy Exp $
 .\"
 .\"
 .\" Copyright (c) 2007 Martin Reindl
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 24 2011 $
 .Dt POWER 4 landisk
 .Os
 .Sh NAME
@@ -30,7 +30,7 @@ The
 .Nm
 driver catches that interrupt.
 If the
-.Va machdep.kbdreset
+.Va hw.allowpowerdown
 .Xr sysctl 8
 is set to 1,
 .Nm power
@@ -39,7 +39,10 @@ will signal
 to do a clean shutdown.
 .Sh SEE ALSO
 .Xr intro 4 ,
-.Xr obio 4
+.Xr obio 4 ,
+.Xr init 8 ,
+.Xr rc.shutdown 8 ,
+.Xr sysctl 8
 .Sh HISTORY
 Support for the
 .Nm
diff --git a/share/man/man4/man4.sgi/power.4 b/share/man/man4/man4.sgi/power.4
index d56f6b78abc..aabc55ede45 100644
--- a/share/man/man4/man4.sgi/power.4
+++ b/share/man/man4/man4.sgi/power.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: power.4,v 1.3 2009/10/26 18:38:09 miod Exp $
+.\"     $OpenBSD: power.4,v 1.4 2011/06/24 19:47:48 naddy Exp $
 .\"
 .\" Copyright (c) 2007 Jasper Lievisse Adriaanse <jasper@openbsd.org>
 .\" All rights reserved.
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 26 2009 $
+.Dd $Mdocdate: June 24 2011 $
 .Dt POWER 4 sgi
 .Os
 .Sh NAME
@@ -31,7 +31,7 @@ The
 .Nm
 driver catches that interrupt.
 If the
-.Va machdep.kbdreset
+.Va hw.allowpowerdown
 .Xr sysctl 8
 is set to 1,
 .Nm
diff --git a/share/man/man4/man4.sparc64/power.4 b/share/man/man4/man4.sparc64/power.4
index eddcb7fd91a..63d2da376a0 100644
--- a/share/man/man4/man4.sparc64/power.4
+++ b/share/man/man4/man4.sparc64/power.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: power.4,v 1.4 2007/05/31 19:19:57 jmc Exp $
+.\"     $OpenBSD: power.4,v 1.5 2011/06/24 19:47:48 naddy Exp $
 .\"
 .\" Copyright (c) 2006 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 24 2011 $
 .Dt POWER 4 sparc64
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@ The
 .Nm
 driver catches that interrupt.
 If the
-.Va machdep.kbdreset
+.Va hw.allowpowerdown
 .Xr sysctl 8
 is set to 1,
 .Nm power
diff --git a/share/man/man4/man4.zaurus/zkbd.4 b/share/man/man4/man4.zaurus/zkbd.4
index ccfee87adb6..05ffca6905d 100644
--- a/share/man/man4/man4.zaurus/zkbd.4
+++ b/share/man/man4/man4.zaurus/zkbd.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: zkbd.4,v 1.16 2007/05/31 19:19:57 jmc Exp $
+.\" $OpenBSD: zkbd.4,v 1.17 2011/06/24 19:47:48 naddy Exp $
 .\"
 .\" Copyright (c) 2004 Theo de Raadt <deraadt@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 24 2011 $
 .Dt ZKBD 4 zaurus
 .Os
 .Sh NAME
@@ -77,7 +77,8 @@ End
 On/Off is special: pressing the key will immediately suspend the system.
 Pressing the key while the Zaurus is suspended will cause it to resume.
 Pressing the key longer than 3 seconds will do a nice halt if
-the machdep.kbdreset
+the
+.Va hw.allowpowerdown
 .Xr sysctl 8
 variable is 1.
 .Pp
diff --git a/share/man/man7/securelevel.7 b/share/man/man7/securelevel.7
index b935ebb55a6..4bb98bb48dc 100644
--- a/share/man/man7/securelevel.7
+++ b/share/man/man7/securelevel.7
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: securelevel.7,v 1.22 2009/05/09 13:45:28 sthen Exp $
+.\"     $OpenBSD: securelevel.7,v 1.23 2011/06/24 19:47:48 naddy Exp $
 .\"
 .\" Copyright (c) 2000 Hugh Graham
 .\"
@@ -23,7 +23,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 9 2009 $
+.Dd $Mdocdate: June 24 2011 $
 .Dt SECURELEVEL 7
 .Os
 .Sh NAME
@@ -80,6 +80,11 @@ the
 variable may not be changed
 .It
 the
+.Va hw.allowpowerdown
+.Xr sysctl 8
+variable may not be changed
+.It
+the
 .Va net.inet.ip.sourceroute
 .Xr sysctl 8
 variable may not be changed