Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 Dec 2008 19:12:30 +0000 (UTC)
From:      Andrew Thompson <thompsa@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r186249 - in head/etc: . devd mtree
Message-ID:  <200812171912.mBHJCUBQ012835@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: thompsa
Date: Wed Dec 17 19:12:30 2008
New Revision: 186249
URL: http://svn.freebsd.org/changeset/base/186249

Log:
  Add /etc/devd/ and move hardware specific configuration there. This makes it
  easier to maintain custom rules for non-system things like ACPI hotkeys.
  
  /etc/devd.conf is already set up to check this directory, no change needed there.

Added:
  head/etc/devd/
  head/etc/devd/Makefile   (contents, props changed)
  head/etc/devd/asus.conf   (contents, props changed)
Modified:
  head/etc/Makefile
  head/etc/devd.conf
  head/etc/mtree/BSD.root.dist

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Wed Dec 17 19:05:58 2008	(r186248)
+++ head/etc/Makefile	Wed Dec 17 19:12:30 2008	(r186249)
@@ -162,6 +162,7 @@ distribution:
 	${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
 .endif
 	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
+	${_+_}cd ${.CURDIR}/devd; ${MAKE} install
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
 	${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
 	${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install

Modified: head/etc/devd.conf
==============================================================================
--- head/etc/devd.conf	Wed Dec 17 19:05:58 2008	(r186248)
+++ head/etc/devd.conf	Wed Dec 17 19:12:30 2008	(r186249)
@@ -277,29 +277,6 @@ notify 0 {
 	action			"mixer vol +10";
 };
 
-# The next blocks enable volume hotkeys that can be found on the Asus EeePC
-# The four keys above the keyboard notify 0x1a through to 0x1d respectively
-notify 0 {
-        match "system"          "ACPI";
-        match "subsystem"       "ASUS-Eee";
-        match "notify"          "0x13";
-        action                  "mixer 0";
-};
-
-notify 0 {
-        match "system"          "ACPI";
-        match "subsystem"       "ASUS-Eee";
-        match "notify"          "0x14";
-        action                  "mixer vol -10";
-};
-
-notify 0 {
-        match "system"          "ACPI";
-        match "subsystem"       "ASUS-Eee";
-        match "notify"          "0x15";
-        action                  "mixer vol +10";
-};
-
 /* EXAMPLES TO END OF FILE
 
 # The following might be an example of something that a vendor might

Added: head/etc/devd/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/etc/devd/Makefile	Wed Dec 17 19:12:30 2008	(r186249)
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+FILES=	asus.conf
+
+NO_OBJ=
+FILESDIR=	/etc/devd
+FILESMODE=	644
+
+.include <bsd.prog.mk>

Added: head/etc/devd/asus.conf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/etc/devd/asus.conf	Wed Dec 17 19:12:30 2008	(r186249)
@@ -0,0 +1,52 @@
+# $FreeBSD$
+#
+# ASUS specific devd events
+
+# The next blocks enable volume hotkeys that can be found on the Asus EeePC
+notify 0 {
+        match "system"          "ACPI";
+        match "subsystem"       "ASUS-Eee";
+        match "notify"          "0x13";
+        action                  "mixer 0";
+};
+
+notify 0 {
+        match "system"          "ACPI";
+        match "subsystem"       "ASUS-Eee";
+        match "notify"          "0x14";
+        action                  "mixer vol -10";
+};
+
+notify 0 {
+        match "system"          "ACPI";
+        match "subsystem"       "ASUS-Eee";
+        match "notify"          "0x15";
+        action                  "mixer vol +10";
+};
+
+# Enable user hotkeys that can be found on the Asus EeePC
+# The four keys above the keyboard notify 0x1a through to 0x1d respectively
+#notify 0 {
+#        match "system"          "ACPI";
+#        match "subsystem"       "ASUS-Eee";
+#        match "notify"          "0x1a";
+#        action                  "";
+#};
+#notify 0 {
+#        match "system"          "ACPI";
+#        match "subsystem"       "ASUS-Eee";
+#        match "notify"          "0x1b";
+#        action                  "";
+#};
+#notify 0 {
+#        match "system"          "ACPI";
+#        match "subsystem"       "ASUS-Eee";
+#        match "notify"          "0x1c";
+#        action                  "";
+#};
+#notify 0 {
+#        match "system"          "ACPI";
+#        match "subsystem"       "ASUS-Eee";
+#        match "notify"          "0x1d";
+#        action                  "";
+#};

Modified: head/etc/mtree/BSD.root.dist
==============================================================================
--- head/etc/mtree/BSD.root.dist	Wed Dec 17 19:05:58 2008	(r186248)
+++ head/etc/mtree/BSD.root.dist	Wed Dec 17 19:12:30 2008	(r186249)
@@ -28,6 +28,8 @@
         ..
         defaults
         ..
+        devd
+        ..
         gnats
         ..
         gss



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812171912.mBHJCUBQ012835>