svn commit: r336743 - in head: etc usr.sbin/apmd

[Brad Davis]

Author: brd
Date: Thu Jul 26 16:51:23 2018
New Revision: 336743
URL: https://svnweb.freebsd.org/changeset/base/336743

Log:
  Move apmd.conf to CONFS in usr.sbin/apmd which simplifies this nicely.
  
  Approved by:	bapt (mentor)
  Differential Revision:	https://reviews.freebsd.org/D16431

Added:
  head/usr.sbin/apmd/apmd.conf
     - copied unchanged from r336742, head/etc/apmd.conf
Deleted:
  head/etc/apmd.conf
Modified:
  head/etc/Makefile
  head/usr.sbin/apmd/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Thu Jul 26 16:45:25 2018	(r336742)
+++ head/etc/Makefile	Thu Jul 26 16:51:23 2018	(r336743)
@@ -76,12 +76,6 @@ BSM_ETC_DIR=			${DESTDIR}/etc/security
 BIN1+= amd.map
 .endif
 
-.if ${MACHINE} == "i386"
-.if ${MK_APM} != "no"
-BIN1+= apmd.conf
-.endif
-.endif
-
 .if ${MK_AUTOFS} != "no"
 BIN1+=	auto_master
 .endif

Modified: head/usr.sbin/apmd/Makefile
==============================================================================
--- head/usr.sbin/apmd/Makefile	Thu Jul 26 16:45:25 2018	(r336742)
+++ head/usr.sbin/apmd/Makefile	Thu Jul 26 16:51:23 2018	(r336743)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+CONFS=	apmd.conf
 PROG=	apmd
 MAN=	apmd.8
 MANSUBDIR= /i386

Copied: head/usr.sbin/apmd/apmd.conf (from r336742, head/etc/apmd.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.sbin/apmd/apmd.conf	Thu Jul 26 16:51:23 2018	(r336743, copy of r336742, head/etc/apmd.conf)
@@ -0,0 +1,55 @@
+# apmd Configuration File
+#
+# $FreeBSD$
+#
+
+apm_event SUSPENDREQ {
+	exec "/etc/rc.suspend apm suspend";
+}
+
+apm_event USERSUSPENDREQ {
+	exec "sync && sync && sync";
+	exec "sleep 1";
+	exec "apm -z";
+}
+
+apm_event NORMRESUME {
+	exec "/etc/rc.resume apm suspend";
+}
+
+apm_event STANDBYRESUME {
+	exec "/etc/rc.resume apm standby";
+}
+
+# resume event configuration for serial mouse users by
+# reinitializing a moused(8) connected to a serial port.
+#
+#apm_event NORMRESUME {
+#	exec "kill -HUP `cat /var/run/moused.pid`";
+#}
+
+# suspend request event configuration for ATA HDD users:
+# execute standby instead of suspend.
+#
+#apm_event SUSPENDREQ {
+#	reject;
+#	exec "sync && sync && sync";
+#	exec "sleep 1";
+#	exec "apm -Z";
+#}
+
+# Sample entries for battery state monitoring
+#apm_battery 5% discharging {
+#	exec "logger -p user.emerg battery status critical!";
+#	exec "echo T250L8CE-GE-C >/dev/speaker";
+#}
+#apm_battery 1% discharging {
+#	exec "logger -p user.emerg battery low - emergency suspend";
+#	exec "echo T250L16B+BA+AG+GF+FED+DC+CC >/dev/speaker";
+#	exec "apm -z";
+#}
+#apm_battery 99% charging {
+#	exec "logger -p user.notice battery fully charged";
+#}
+
+# apmd Configuration ends here