From 487f6bb8953a3e08b071cd483d0819b5cb9c2127 Mon Sep 17 00:00:00 2001 From: Andrew Thompson Date: Wed, 17 Dec 2008 19:12:30 +0000 Subject: [PATCH] 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. --- etc/Makefile | 1 + etc/devd.conf | 23 ------------------ etc/devd/Makefile | 9 +++++++ etc/devd/asus.conf | 52 +++++++++++++++++++++++++++++++++++++++++ etc/mtree/BSD.root.dist | 2 ++ 5 files changed, 64 insertions(+), 23 deletions(-) create mode 100644 etc/devd/Makefile create mode 100644 etc/devd/asus.conf diff --git a/etc/Makefile b/etc/Makefile index 4fe764958b30..b7c82201a513 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -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 diff --git a/etc/devd.conf b/etc/devd.conf index 601e5886bbee..2b12af0dd8ca 100644 --- a/etc/devd.conf +++ b/etc/devd.conf @@ -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 diff --git a/etc/devd/Makefile b/etc/devd/Makefile new file mode 100644 index 000000000000..f2bb18449178 --- /dev/null +++ b/etc/devd/Makefile @@ -0,0 +1,9 @@ +# $FreeBSD$ + +FILES= asus.conf + +NO_OBJ= +FILESDIR= /etc/devd +FILESMODE= 644 + +.include diff --git a/etc/devd/asus.conf b/etc/devd/asus.conf new file mode 100644 index 000000000000..7671bd1159c0 --- /dev/null +++ b/etc/devd/asus.conf @@ -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 ""; +#}; diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index 2bbd28c862fd..ce8a4562d820 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -28,6 +28,8 @@ .. defaults .. + devd + .. gnats .. gss