[Glibc-bsd-commits] r2934 - in trunk/freebsd-utils/debian: . devfs.d
Aurelien Jarno
aurel32 at alioth.debian.org
Sun Jan 17 15:42:18 UTC 2010
Author: aurel32
Date: 2010-01-17 15:42:15 +0000 (Sun, 17 Jan 2010)
New Revision: 2934
Added:
trunk/freebsd-utils/debian/devfs.d/
trunk/freebsd-utils/debian/devfs.d/00_defaults.rules
trunk/freebsd-utils/debian/freebsd-utils.init
Removed:
trunk/freebsd-utils/debian/freebsd-utils.init
Modified:
trunk/freebsd-utils/debian/changelog
trunk/freebsd-utils/debian/freebsd-utils.install
Log:
* Load /dev permissions through from /etc/devfs.d/* instead of
setting them manually at boot time.
Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog 2010-01-17 12:26:25 UTC (rev 2933)
+++ trunk/freebsd-utils/debian/changelog 2010-01-17 15:42:15 UTC (rev 2934)
@@ -2,8 +2,10 @@
* Add acpiconf and devd binaries, patch by Werner Koch.
* Add devfs binary.
+ * Load /dev permissions through from /etc/devfs.d/* instead of
+ setting them manually at boot time.
- -- Aurelien Jarno <aurel32 at debian.org> Sun, 17 Jan 2010 00:25:43 +0100
+ -- Aurelien Jarno <aurel32 at debian.org> Sun, 17 Jan 2010 16:41:53 +0100
freebsd-utils (8.0-2) unstable; urgency=low
Added: trunk/freebsd-utils/debian/devfs.d/00_defaults.rules
===================================================================
--- trunk/freebsd-utils/debian/devfs.d/00_defaults.rules (rev 0)
+++ trunk/freebsd-utils/debian/devfs.d/00_defaults.rules 2010-01-17 15:42:15 UTC (rev 2934)
@@ -0,0 +1,40 @@
+#
+# This file defines the default owner and permissions of /dev nodes
+#
+
+# default for all nodes
+ user root group root unhide
+
+# audio nodes
+path audio* user root group audio mode 0600
+path dsp* user root group audio mode 0660
+path mixer* user root group audio mode 0660
+
+# cdrom nodes
+path *cd* user root group cdrom mode 0660
+
+# serial port nodes
+path cua* user root group dialout mode 0660
+
+# disk nodes
+path ata user root group disk mode 0640
+path ad* user root group disk mode 0660
+path da* user root group disk mode 0660
+path geom* user root group disk mode 0640
+path pass* user root group disk mode 0660
+
+# floppy nodes
+path fd[0-9]* user root group floppy mode 0660
+
+# memory nodes
+type mem user root group kmem mode 0640
+path audit user root group kmem mode 0640
+
+# parallel port node
+path ppi* user root group lp mode 0660
+
+# tape nodes
+type tape user root group tape mode 0660
+
+# tty nodes
+type tty group tty
Deleted: trunk/freebsd-utils/debian/freebsd-utils.init
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.init 2010-01-17 12:26:25 UTC (rev 2933)
+++ trunk/freebsd-utils/debian/freebsd-utils.init 2010-01-17 15:42:15 UTC (rev 2934)
@@ -1,120 +0,0 @@
-#!/bin/bash
-#
-# skeleton example file to build /etc/init.d/ scripts.
-# This file should be used to construct scripts for /etc/init.d.
-#
-# Written by Miquel van Smoorenburg <miquels at cistron.nl>.
-# Modified for Debian
-# by Ian Murdock <imurdock at gnu.ai.mit.edu>.
-#
-# Version: @(#)skeleton 1.9 26-Feb-2001 miquels at cistron.nl
-#
-
-### BEGIN INIT INFO
-# Provides: freebsd-utils udev
-# Required-Start:
-# Required-Stop:
-# X-Start-Before: mtab
-# Default-Start: S
-# Default-Stop:
-# Short-Description: FreeBSD kernel specific setup
-### END INIT INFO
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-set -e
-
-case "$1" in
- start)
- echo -n "Setting up /dev permissions..."
-
- # only do this during boot, to avoid messing up ttys
- if [ "$RUNLEVEL" = "S" ] ; then
- chown root:root /dev/* 2> /dev/null
- fi
-
- for i in /dev/dsp{,[0-9]} /dev/mixer{,[0-9]} /dev/audio{,ctl,[0-9]} ; do
- if test -e $i ; then
- chgrp audio $i
- fi
- done
- for i in /dev/{,a}cd[0-9] ; do
- if test -e $i ; then
- chgrp cdrom $i
- fi
- done
- for i in /dev/console /dev/ptyp[0-9] ; do
- if test -e $i ; then
- chgrp tty $i
- fi
- done
- for i in /dev/fd[0-9] ; do
- if test -e $i ; then
- chgrp floppy $i
- fi
- done
- for i in /dev/ata /dev/ad[0-9]* /dev/da[0-9]* ; do
- if test -e $i ; then
- chgrp disk $i
- fi
- done
- for i in /dev/{,k}mem ; do
- if test -e $i ; then
- chgrp kmem $i
- fi
- done
- for i in /dev/lpt[0-9]* ; do
- if test -e $i ; then
- chgrp lp $i
- fi
- done
- for i in /dev/cuaa[0-9] ; do
- if test -e $i ; then
- chgrp dialout $i
- fi
- done
-
- # setup /dev/cdrom symlink
- if ! test -e /dev/cdrom && ! test -L /dev/cdrom ; then
- for i in {,a}cd{0,1,2,3,4,5,6,7,8,9} ; do
- if test -e /dev/$i ; then
- ln -s $i /dev/cdrom
- break
- fi
- done
- fi
-
- echo "done."
-
- if [ "$(readlink /etc/mtab)" != "/proc/mounts" ] ; then
- echo "Warning: replacing /etc/mtab by a symlink to /proc/mounts."
- rm -f /etc/mtab
- ln -sf /proc/mounts /etc/mtab
- fi
-
- # Mount /dev/fd, /proc and /sys
- if ! test -f /proc/cmdline ; then
- mount -t linprocfs proc /proc
- fi
- if ! test -d /sys/devices ; then
- # Should be done during the installation
- if [ ! -d /sys ] ; then
- mkdir /sys
- fi
- mount -t linsysfs sys /sys
- fi
- if ! mount | grep -q "on /dev/fd (fdescfs" ; then
- mount -t fdescfs fdescfs /dev/fd
- fi
- ;;
-
- stop|reload|restart|force-reload)
- ;;
-
- *)
- echo "Usage: $0 {start|stop|restart|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
-
Added: trunk/freebsd-utils/debian/freebsd-utils.init
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.init (rev 0)
+++ trunk/freebsd-utils/debian/freebsd-utils.init 2010-01-17 15:42:15 UTC (rev 2934)
@@ -0,0 +1,86 @@
+#!/bin/bash
+#
+# skeleton example file to build /etc/init.d/ scripts.
+# This file should be used to construct scripts for /etc/init.d.
+#
+# Written by Miquel van Smoorenburg <miquels at cistron.nl>.
+# Modified for Debian
+# by Ian Murdock <imurdock at gnu.ai.mit.edu>.
+#
+# Version: @(#)skeleton 1.9 26-Feb-2001 miquels at cistron.nl
+#
+
+### BEGIN INIT INFO
+# Provides: freebsd-utils udev
+# Required-Start:
+# Required-Stop:
+# X-Start-Before: mtab
+# Default-Start: S
+# Default-Stop:
+# Short-Description: FreeBSD kernel specific setup
+### END INIT INFO
+
+set -e
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+. /lib/lsb/init-functions
+
+case "$1" in
+ start)
+ if [ "$(readlink /etc/mtab)" != "/proc/mounts" ] ; then
+ log_warning_msg "Warning: replacing /etc/mtab by a symlink to /proc/mounts."
+ rm -f /etc/mtab
+ ln -sf /proc/mounts /etc/mtab
+ fi
+
+ log_action_begin_msg "Loading devfs rules"
+ RULESET=1 # Use ruleset 1 for the default settings
+ devfs rule -s $RULESET delset
+ for rule in /etc/devfs.d/*.rules ; do
+ egrep -v '^[[:space:]]*(#|$)' $rule | devfs rule -s $RULESET add -
+ done
+ devfs rule -s $RULESET applyset
+ log_action_end_msg $?
+
+ log_action_begin_msg "Setting up /dev links"
+ # setup /dev/cdrom symlink
+ if ! test -e /dev/cdrom && ! test -L /dev/cdrom ; then
+ for i in {,a}cd{0,1,2,3,4,5,6,7,8,9} ; do
+ if test -e /dev/$i ; then
+ ln -s $i /dev/cdrom
+ break
+ fi
+ done
+ fi
+ log_action_end_msg 0
+
+ log_action_begin_msg "Mounting kernel filesystems"
+ # Mount /dev/fd, /proc and /sys
+ if ! test -f /proc/cmdline ; then
+ mount -t linprocfs proc /proc
+ fi
+ if ! test -d /sys/devices ; then
+ # Should be done during the installation
+ if [ ! -d /sys ] ; then
+ mkdir /sys
+ fi
+ mount -t linsysfs sys /sys
+ fi
+ if ! mount | grep -q "on /dev/fd (fdescfs" ; then
+ mount -t fdescfs fdescfs /dev/fd
+ fi
+ log_action_end_msg 0
+ ;;
+
+ stop|reload|restart|force-reload)
+ ;;
+
+ *)
+ echo "Usage: $0 {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
+
Modified: trunk/freebsd-utils/debian/freebsd-utils.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.install 2010-01-17 12:26:25 UTC (rev 2933)
+++ trunk/freebsd-utils/debian/freebsd-utils.install 2010-01-17 15:42:15 UTC (rev 2934)
@@ -6,6 +6,7 @@
usr.bin/ktrace/ktrace /bin
+debian/devfs.d /etc
debian/scripts/bin/mount /bin
debian/scripts/bin/sysctl /bin
debian/scripts/sbin/umount /sbin
More information about the Glibc-bsd-commits
mailing list