diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2005-12-28 22:10:18 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2005-12-28 22:10:18 +0000 |
| commit | 573ac89ff422815e5758185c330a58d993572345 (patch) | |
| tree | 46913514e730256666128b75f59d19afb9f5cfc1 | |
| parent | 499ce00f1e5347cb9dbf6140efc48f16ebf94dfe (diff) | |
support newer udev rules+permissions format
install udev rules by default, since it's so common on distros now
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@879 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | Makefile | 26 | ||||
| -rw-r--r-- | udev/zaptel.rules-combined | 6 |
2 files changed, 29 insertions, 3 deletions
@@ -85,9 +85,15 @@ ifeq (${BUILDVER},linux24) #We only support DEVFS in linux 2.4 kernels, since its considered obsolete post 2.4 DYNFS:=$(shell ps ax | grep -v grep | grep -q devfsd && echo "yes") endif + ifeq (${BUILDVER},linux26) -#Tests for newer linux-2.6 udev support -DYNFS:=$(shell ps ax | grep -v grep | grep udevd && echo "yes") + ifneq (,$(wildcard $(ROOT_PREFIX)/etc/udev/rules.d)) + DYNFS=yes + UDEVRULES=yes + ifneq (,$(wildcard $(ROOT_PREFIX)/etc/udev/permissions.d)) + UDEVPERMISSIONS=yes + endif + endif endif CHKCONFIG:=$(shell sh -c 'type -p chkconfig' 2> /dev/null) @@ -320,8 +326,16 @@ ifndef DYNFS N=$$[$$N+1]; \ done else # DYNFS + ifdef UDEVRULES + ifdef UDEVPERMISSIONS + install -m 444 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d + install -m 444 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d + else # !UDEVPERMISSIONS (newer, combined syntax) + install -m 444 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules + endif + else # !UDEVRULES @echo "**** Dynamic filesystem detected -- not creating device nodes" - @echo "**** If you are running udev, read README.udev" + endif endif install: all devices @@ -398,8 +412,14 @@ install: all devices [ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE) install-udev: + ifdef UDEVRULES + ifdef UDEVPERMISSIONS install -m 444 udev/zaptel.rules $(INSTALL_PREFIX)/etc/udev/rules.d install -m 444 udev/zaptel.permissions $(INSTALL_PREFIX)/etc/udev/permissions.d + else # !UDEVPERMISSIONS (newer, combined syntax) + install -m 444 udev/zaptel.rules-combined $(INSTALL_PREFIX)/etc/udev/rules.d/zaptel.rules + endif + endif config: if [ -d $(INSTALL_PREFIX)/etc/rc.d/init.d ]; then \ diff --git a/udev/zaptel.rules-combined b/udev/zaptel.rules-combined new file mode 100644 index 0000000..545e94f --- /dev/null +++ b/udev/zaptel.rules-combined @@ -0,0 +1,6 @@ +# zaptel devices with ownership/permissions for running as non-root +KERNEL="zapctl", NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660" +KERNEL="zaptimer", NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660" +KERNEL="zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660" +KERNEL="zappseudo", NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660" +KERNEL="zap[0-9]*", NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660" |