diff options
| author | Christian Weisgerber <naddy@cvs.openbsd.org> | 2011-06-24 19:47:50 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@cvs.openbsd.org> | 2011-06-24 19:47:50 +0000 |
| commit | 3da505965757e4e925366c29b363105405fd202d (patch) | |
| tree | 3bd93b0681c5ada7d7dac32ec4fcd54b6063055f /etc | |
| parent | 7f1ea65fed8697f18acb9a18feab7940904e5e80 (diff) | |
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@
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/etc.landisk/sysctl.conf | 1 | ||||
| -rw-r--r-- | etc/etc.loongson/sysctl.conf | 1 | ||||
| -rw-r--r-- | etc/etc.palm/sysctl.conf | 1 | ||||
| -rw-r--r-- | etc/etc.sgi/sysctl.conf | 1 | ||||
| -rw-r--r-- | etc/etc.sparc64/sysctl.conf | 1 | ||||
| -rw-r--r-- | etc/etc.zaurus/sysctl.conf | 1 | ||||
| -rw-r--r-- | etc/sysctl.conf | 3 |
7 files changed, 2 insertions, 7 deletions
diff --git a/etc/etc.landisk/sysctl.conf b/etc/etc.landisk/sysctl.conf index 8128872c162..a73015c114c 100644 --- a/etc/etc.landisk/sysctl.conf +++ b/etc/etc.landisk/sysctl.conf @@ -1,2 +1 @@ -#machdep.kbdreset=1 # permit console to do a nice halt #machdep.led_blink=1 # blink the power led diff --git a/etc/etc.loongson/sysctl.conf b/etc/etc.loongson/sysctl.conf index 393f66d8884..e69de29bb2d 100644 --- a/etc/etc.loongson/sysctl.conf +++ b/etc/etc.loongson/sysctl.conf @@ -1 +0,0 @@ -#machdep.kbdreset=1 # 1=Enable power button shutdown diff --git a/etc/etc.palm/sysctl.conf b/etc/etc.palm/sysctl.conf index 04d5e3b0ba5..b743bf5a96b 100644 --- a/etc/etc.palm/sysctl.conf +++ b/etc/etc.palm/sysctl.conf @@ -1,4 +1,3 @@ -#machdep.kbdreset=1 # permit zkbd(4) power key to do a nice halt #machdep.maxspeed=520 # set change maximum processor speed #machdep.lidsuspend=1 # closing the lid will suspend machine #hw.setperf=0 # 0=slowest speed, 100=fastest speed diff --git a/etc/etc.sgi/sysctl.conf b/etc/etc.sgi/sysctl.conf index 393f66d8884..e69de29bb2d 100644 --- a/etc/etc.sgi/sysctl.conf +++ b/etc/etc.sgi/sysctl.conf @@ -1 +0,0 @@ -#machdep.kbdreset=1 # 1=Enable power button shutdown diff --git a/etc/etc.sparc64/sysctl.conf b/etc/etc.sparc64/sysctl.conf index 101cc47ccd4..38cba543cc2 100644 --- a/etc/etc.sparc64/sysctl.conf +++ b/etc/etc.sparc64/sysctl.conf @@ -1,3 +1,2 @@ #machdep.led_blink=1 # 1=On sparc64, make led(s) blink #machdep.allowaperture=1 # See xf86(4) -#machdep.kbdreset=1 # permit console to do a nice halt diff --git a/etc/etc.zaurus/sysctl.conf b/etc/etc.zaurus/sysctl.conf index 04d5e3b0ba5..b743bf5a96b 100644 --- a/etc/etc.zaurus/sysctl.conf +++ b/etc/etc.zaurus/sysctl.conf @@ -1,4 +1,3 @@ -#machdep.kbdreset=1 # permit zkbd(4) power key to do a nice halt #machdep.maxspeed=520 # set change maximum processor speed #machdep.lidsuspend=1 # closing the lid will suspend machine #hw.setperf=0 # 0=slowest speed, 100=fastest speed diff --git a/etc/sysctl.conf b/etc/sysctl.conf index ed92f14a411..4650854b4a1 100644 --- a/etc/sysctl.conf +++ b/etc/sysctl.conf @@ -1,4 +1,4 @@ -# $OpenBSD: sysctl.conf,v 1.51 2011/04/04 11:14:33 deraadt Exp $ +# $OpenBSD: sysctl.conf,v 1.52 2011/06/24 19:47:48 naddy Exp $ # # This file contains a list of sysctl options the user wants set at # boot time. See sysctl(3) and sysctl(8) for more information on @@ -36,3 +36,4 @@ #kern.watchdog.period=32 # >0=Enable hardware watchdog(4) timer if available #kern.watchdog.auto=0 # 0=Disable automatic watchdog(4) retriggering #kern.pool_debug=0 # 0=Disable pool corruption checks (faster) +#hw.allowpowerdown=0 # 0=Disable power button shutdown |