summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMartin Natano <natano@cvs.openbsd.org>2017-03-02 10:38:11 +0000
committerMartin Natano <natano@cvs.openbsd.org>2017-03-02 10:38:11 +0000
commit74ec58af25dbea2773d924537499c413d0d983dd (patch)
tree9a9d0c79a40dd17ac87ca0acbfdb4623020c08bc /etc
parent6bfb01fcf4947233b8bf5ffe005dbc1f79a35df0 (diff)
Add a new sysctl machdep.lidaction. The sysctl works as follows:
machdep.lidaction=0 # do nothing machdep.lidaction=1 # suspend machdep.lidaction=2 # hibernate lidsuspend is just an alias for lidaction, so if you change one, the other one will have the same value. The plan is to remove machdep.lidsuspend eventually when people have upgraded their /ets/sysctl.conf. discussed with deraadt, who came up with the new MIB name no objections mlarkin ok stsp halex jcs
Diffstat (limited to 'etc')
-rw-r--r--etc/etc.amd64/sysctl.conf2
-rw-r--r--etc/etc.i386/sysctl.conf2
-rw-r--r--etc/etc.loongson/sysctl.conf2
3 files changed, 3 insertions, 3 deletions
diff --git a/etc/etc.amd64/sysctl.conf b/etc/etc.amd64/sysctl.conf
index ba90bf714f0..b1b64952365 100644
--- a/etc/etc.amd64/sysctl.conf
+++ b/etc/etc.amd64/sysctl.conf
@@ -1,3 +1,3 @@
#machdep.allowaperture=2 # See xf86(4)
#machdep.kbdreset=1 # permit console CTRL-ALT-DEL to do a nice halt
-#machdep.lidsuspend=0 # do not suspend laptop upon lid closing
+#machdep.lidaction=0 # 1=suspend, 2=hibernate laptop upon lid closing
diff --git a/etc/etc.i386/sysctl.conf b/etc/etc.i386/sysctl.conf
index 48f492dc82d..9e8d3252d85 100644
--- a/etc/etc.i386/sysctl.conf
+++ b/etc/etc.i386/sysctl.conf
@@ -1,4 +1,4 @@
#machdep.allowaperture=2 # See xf86(4)
#machdep.apmhalt=1 # 1=powerdown hack, try if halt -p doesn't work
#machdep.kbdreset=1 # permit console CTRL-ALT-DEL to do a nice halt
-#machdep.lidsuspend=0 # do not suspend laptop upon lid closing
+#machdep.lidaction=0 # 1=suspend, 2=hibernate laptop upon lid closing
diff --git a/etc/etc.loongson/sysctl.conf b/etc/etc.loongson/sysctl.conf
index e6491005aa6..a3f6e594cad 100644
--- a/etc/etc.loongson/sysctl.conf
+++ b/etc/etc.loongson/sysctl.conf
@@ -1 +1 @@
-#machdep.lidsuspend=0 # do not suspend laptop upon lid closing
+#machdep.lidaction=0 # 1=suspend, 2=hibernate laptop upon lid closing