diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-01-12 16:33:32 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-01-12 16:33:32 +0000 |
| commit | 0f19f197e4c7dbe7db988f2bb501c7b513644f64 (patch) | |
| tree | 07f634ed4d90dcfaf89374ce8934767be9c89ce9 /distrib/miniroot | |
| parent | a3fb551dc33f569f1fb5383b8cee4036616b508e (diff) | |
Enable lid suspends by default in the kernel, and remove the question from
the installer. We used a full release cycle to learn that suspend/resume
is reliable enough for this default. Personal policy can disable this using
machdep.lidsuspend=0 in /etc/sysctl.conf
ok more people begging, and less people whining
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/install.sub | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 5a32649cf9e..0aff0d0f65d 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.808 2015/01/07 19:31:51 rpe Exp $ +# $OpenBSD: install.sub,v 1.809 2015/01/12 16:33:31 deraadt Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback # All rights reserved. @@ -1842,10 +1842,6 @@ apply() echo "machdep.allowaperture=$aperture # See xf86(4)" \ >>/mnt/etc/sysctl.conf - [[ -n $lidsuspend ]] && - echo "machdep.lidsuspend=1 # Try to suspend on lid close" \ - >>/mnt/etc/sysctl.conf - [[ $xdm == y && -x /mnt/usr/X11R6/bin/xdm ]] && echo "xdm_flags=" >>/mnt/etc/rc.conf.local @@ -1876,7 +1872,6 @@ questions() { aperture= xdm= - lidsuspend= if [[ -n $DISPLAY ]]; then if [[ -n $(scan_dmesg '/^[a-z]*[01]: aperture needed/p') ]]; then ask_yn "Do you expect to run the X Window System?" yes && @@ -1886,10 +1881,6 @@ questions() { ask_yn "Do you want the X Window System to be started by xdm(1)?" xdm=$resp fi - if [[ -n $MDLID ]]; then - ask_yn "Do you want to suspend on lid close?" yes && \ - lidsuspend=$resp - fi fi if [[ -n $CDEV ]]; then |