rpms/udev/devel udev.conf, 1.14, 1.15 udev.rules, 1.19, 1.20 udev.spec, 1.78, 1.79
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Apr 11 13:03:54 UTC 2005
Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2165
Modified Files:
udev.conf udev.rules udev.spec
Log Message:
update to udev-056
Index: udev.conf
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.conf,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- udev.conf 4 Nov 2004 16:16:37 -0000 1.14
+++ udev.conf 11 Apr 2005 13:03:51 -0000 1.15
@@ -16,9 +16,6 @@
# udev_rules - The name and location of the udev rules file
udev_rules="/etc/udev/rules.d/"
-# udev_permissions - The name and location of the udev permission file
-udev_permissions="/etc/udev/permissions.d/"
-
# default_mode - set the default mode for all nodes that have no
# explicit match in the permissions file
default_mode="0600"
Index: udev.rules
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.rules,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- udev.rules 10 Feb 2005 11:10:57 -0000 1.19
+++ udev.rules 11 Apr 2005 13:03:51 -0000 1.20
@@ -1,9 +1,190 @@
# There are a number of modifiers that are allowed to be used in some of the
# fields. See the udev man page for a full description of them.
#
-# See the udev.rules.examples file for more examples of how to create rules
+# default is OWNER="root" GROUP="root", MODE="0600"
#
+# console devices
+KERNEL="tty" , MODE="0666"
+KERNEL="tty[0-9]" , GROUP="tty", MODE="0660"
+KERNEL="tty[0-9][0-9]*" , GROUP="tty", MODE="0660"
+KERNEL="vc/[0-9]*" , GROUP="tty", MODE="0660"
+
+# pty devices
+# Set this to 0660 if you only want users belonging to tty group
+# to be able to allocate PTYs
+KERNEL="ptmx" , GROUP="tty", MODE="0666"
+KERNEL="pty[p-za-e][0-9a-f]*", GROUP="tty", MODE="0660"
+KERNEL="tty[p-za-e][0-9a-f]*", GROUP="tty", MODE="0660"
+KERNEL="pty/m*" , GROUP="tty", MODE="0660"
+KERNEL="vc/s*" , GROUP="tty", MODE="0660"
+
+# serial+dialup devices
+KERNEL="ttyS*" , GROUP="uucp", MODE="0660"
+KERNEL="ippp*" , MODE="0660"
+KERNEL="isdn*" , MODE="0660"
+KERNEL="isdnctrl*" , MODE="0660"
+KERNEL="capi*" , MODE="0660"
+KERNEL="dcbri*" , MODE="0660"
+KERNEL="ircomm*" , GROUP="uucp", MODE="0660"
+KERNEL="ttyUSB*" , GROUP="uucp", MODE="0660"
+KERNEL="tts/[0-9]*" , GROUP="uucp", MODE="0660"
+KERNEL="tts/USB[0-9]*" , GROUP="uucp", MODE="0660"
+
+# vc devices
+KERNEL="vcs" , OWNER="vcsa", GROUP="tty"
+KERNEL="vcs[0-9]*" , OWNER="vcsa", GROUP="tty"
+KERNEL="vcsa" , OWNER="vcsa", GROUP="tty"
+KERNEL="vcsa[0-9]*" , OWNER="vcsa", GROUP="tty"
+KERNEL="vcc/*" , OWNER="vcsa", GROUP="tty"
+
+# memory devices
+KERNEL="random" , MODE="0666"
+KERNEL="urandom" , MODE="0444"
+KERNEL="mem" , GROUP="kmem", MODE="0640"
+KERNEL="kmem" , GROUP="kmem", MODE="0640"
+KERNEL="port" , GROUP="kmem", MODE="0640"
+KERNEL="full" , MODE="0666"
+KERNEL="null" , MODE="0666"
+KERNEL="zero" , MODE="0666"
+
+# misc devices
+KERNEL="nvram" , MODE="0660"
+KERNEL="rtc" , MODE="0644"
+
+# floppy devices
+KERNEL="fd[01]*" , GROUP="floppy", MODE="0660"
+
+# audio devices
+KERNEL="dsp*" , MODE="0660"
+KERNEL="audio*" , MODE="0660"
+KERNEL="midi*" , MODE="0660"
+KERNEL="mixer*" , MODE="0660"
+KERNEL="sequencer*" , MODE="0660"
+KERNEL="sound/*" , MODE="0660"
+KERNEL="snd/*" , MODE="0660"
+KERNEL="beep" , MODE="0660"
+KERNEL="admm*" , MODE="0660"
+KERNEL="adsp*" , MODE="0660"
+KERNEL="aload*" , MODE="0660"
+KERNEL="amidi*" , MODE="0660"
+KERNEL="dmfm*" , MODE="0660"
+KERNEL="dmmidi*" , MODE="0660"
+KERNEL="sndstat" , MODE="0660"
+
+# optical devices
+KERNEL="sr*" , GROUP="disk", MODE="0640"
+KERNEL="scd*" , GROUP="disk", MODE="0640"
+KERNEL="pcd*" , GROUP="disk", MODE="0640"
+KERNEL="disk*" , GROUP="disk", MODE="0640"
+KERNEL="dvd" , GROUP="disk", MODE="0640"
+KERNEL="rdvd" , GROUP="disk", MODE="0640"
+KERNEL="cdroms/*" , GROUP="disk", MODE="0640"
+
+# pilot/palm devices
+KERNEL="pilot" , GROUP="uucp", MODE="0660"
+
+# jaz devices
+KERNEL="jaz*" , GROUP="disk", MODE="0640"
+
+# zip devices
+KERNEL="pocketzip*" , GROUP="disk", MODE="0640"
+KERNEL="zip*" , GROUP="disk", MODE="0640"
+
+# ls120 devices
+KERNEL="ls120" , GROUP="disk", MODE="0640"
+KERNEL="ls120*" , GROUP="disk", MODE="0640"
+
+# lp devices
+KERNEL="lp*" , GROUP="lp", MODE="0660"
+KERNEL="parport*" , GROUP="lp", MODE="0660"
+KERNEL="irlpt*" , GROUP="lp", MODE="0660"
+KERNEL="usblp*" , GROUP="lp", MODE="0660"
+KERNEL="usb/lp*" , GROUP="lp", MODE="0660"
+
+# raw devices
+KERNEL="ram*" , GROUP="disk", MODE="0640"
+KERNEL="raw/*" , GROUP="disk", MODE="0640"
+
+# disk devices
+KERNEL="hd*" , GROUP="disk", MODE="0640"
+KERNEL="sd*" , GROUP="disk", MODE="0640"
+KERNEL="dasd*" , GROUP="disk", MODE="0640"
+KERNEL="ataraid*" , GROUP="disk", MODE="0640"
+KERNEL="loop*" , GROUP="disk", MODE="0640"
+KERNEL="md*" , GROUP="disk", MODE="0640"
+KERNEL="ide/*/*/*/*/*" , GROUP="disk", MODE="0640"
+KERNEL="discs/*/*" , GROUP="disk", MODE="0640"
+KERNEL="loop/*" , GROUP="disk", MODE="0640"
+KERNEL="md/*" , GROUP="disk", MODE="0640"
+
+# tape devices
+KERNEL="ht*" , GROUP="disk", MODE="0640"
+KERNEL="nht*" , GROUP="disk", MODE="0640"
+KERNEL="pt[0-9]*" , GROUP="disk", MODE="0640"
+KERNEL="npt*" , GROUP="disk", MODE="0640"
+KERNEL="st*", GROUP="disk", MODE="0640"
+KERNEL="nst*" , GROUP="disk", MODE="0640"
+KERNEL="osst*" , GROUP="disk", MODE="0640"
+KERNEL="nosst*" , GROUP="disk", MODE="0640"
+
+# dm devices
+KERNEL="dm-*" , MODE="0640"
+
+
+# diskonkey devices
+KERNEL="diskonkey*" , GROUP="disk", MODE="0640"
+
+# rem_ide devices
+KERNEL="microdrive*" , GROUP="disk", MODE="0640"
+
+
+# kbd devices
+KERNEL="kbd" , MODE="0644"
+
+# joystick devices
+KERNEL="js[0-9]*" , MODE="0644"
+KERNEL="djs[0-9]*" , MODE="0644"
+
+# v4l devices
+KERNEL="video*" , MODE="0660"
+KERNEL="radio*" , MODE="0660"
+KERNEL="winradio*" , MODE="0660"
+KERNEL="vtx*" , MODE="0660"
+KERNEL="vbi*" , MODE="0660"
+KERNEL="video/*" , MODE="0660"
+KERNEL="vttuner" , MODE="0660"
+KERNEL="v4l/*" , MODE="0660"
+
+# input devices
+KERNEL="input/*" , MODE="0644"
+
+# gpm devices
+KERNEL="gpmctl" , MODE="0700"
+
+# dri devices
+KERNEL="nvidia*" , MODE="0660"
+KERNEL="3dfx*" , MODE="0660"
+KERNEL="dri/*" , MODE="0666"
+
+# scsi devices
+KERNEL="sg*" , GROUP="disk", MODE="0640"
+KERNEL="pg*" , GROUP="disk", MODE="0640"
+KERNEL="cdwriter" , GROUP="disk", MODE="0640"
+
+# usb devices
+KERNEL="usb/dabusb*" , GROUP="usb", MODE="0660"
+KERNEL="usb/mdc800*" , GROUP="usb", MODE="0660"
+KERNEL="usb/rio500" , GROUP="usb", MODE="0660"
+
+# s390 devices
+KERNEL="z90crypt" , MODE="0666"
+
+# DVB
+KERNEL="dvb/*" , MODE="0660"
+KERNEL="dvb" , MODE="0660"
+KERNEL="dvb/adapter*" , MODE="0660"
+
# create a symlink named after the device map name
# note devmap_name comes with extras/multipath
#KERNEL="dm-[0-9]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK="%c"
Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- udev.spec 29 Mar 2005 09:23:22 -0000 1.78
+++ udev.spec 11 Apr 2005 13:03:51 -0000 1.79
@@ -6,8 +6,8 @@
Summary: A userspace implementation of devfs
Name: udev
-Version: 050
-Release: 10
+Version: 056
+Release: 1
License: GPL
Group: System Environment/Base
%if !%{with_persistent}
@@ -16,7 +16,6 @@
%endif
Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
Source1: udev.rules
-Source2: udev.permissions
Source3: udev.conf
Source4: pam_console.dev
Source5: MAKEDEV.dev
@@ -37,6 +36,8 @@
Source21: udev.html
Source22: udev.nodes
+Source23: udevpermconv.sh
+
Patch1: udev-039-static.patch
Patch4: udev-048-selinux.patch
@@ -74,8 +75,8 @@
%prep
%setup -q
-%patch1 -p1 -b .glibcstatic
-%patch4 -p1 -b .selinux
+#%patch1 -p1 -b .glibcstatic
+#%patch4 -p1 -b .selinux
touch etc/init.d/udev.debian
@@ -93,11 +94,13 @@
make CC="gcc $RPM_OPT_FLAGS -DUDEV_STATIC" LD="gcc $RPM_OPT_FLAGS -static" \
USE_KLIBC=false \
USE_SELINUX=true \
+ USE_STATIC=true \
udevdir="/dev" \
USE_LOG=false DEBUG=%{debug} \
- EXTRAS="" udev
+ EXTRAS="extras/scsi_id" all
mv udev udev.static
+mv extras/scsi_id/scsi_id extras/scsi_id/scsi_id.static
make clean
make CC="gcc $RPM_OPT_FLAGS" \
@@ -133,14 +136,12 @@
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.rules
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.permissions
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/udev
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/{rules.d,permissions.d,scripts,devices,makedev.d}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/{rules.d,scripts,devices,makedev.d}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/{default,block}
install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/50-udev.rules
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/permissions.d/50-udev.permissions
install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.conf
@@ -149,6 +150,7 @@
# obsoleted by selinux patch
#install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/default
install -m 0755 udev.static $RPM_BUILD_ROOT/sbin/udev.static
+install -m 0755 extras/scsi_id/scsi_id.static $RPM_BUILD_ROOT/sbin/scsi_id.static
ln -s udev.static $RPM_BUILD_ROOT/sbin/udevstart.static
%if %{with_persistent}
@@ -166,6 +168,7 @@
install -m 0755 %{SOURCE17} $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
install -m 0755 %{SOURCE18} $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
install -m 0755 %{SOURCE19} $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
+install -m 0755 %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
install -m 0755 %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/50-udev.nodes
@@ -215,7 +218,6 @@
%defattr(-,root,root)
%doc COPYING README TODO ChangeLog HOWTO* docs/* udev.html
%doc etc/udev/redhat/udev.rules
-%doc etc/udev/redhat/udev.permissions
%attr(0755,root,root) /sbin/udev
%attr(0755,root,root) /sbin/udev.static
@@ -233,7 +235,6 @@
%attr(0755,root,root) %dir %{_sysconfdir}/udev/
%attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/
-%attr(0755,root,root) %dir %{_sysconfdir}/udev/permissions.d/
%attr(0755,root,root) %dir %{_sysconfdir}/udev/scripts/
%attr(0755,root,root) %dir %{_sysconfdir}/udev/devices/
%attr(0755,root,root) %dir %{_sysconfdir}/udev/makedev.d/
@@ -257,10 +258,10 @@
%attr(0755,root,root) %{_sysconfdir}/udev/scripts/check-cdrom.sh
%attr(0755,root,root) %{_sysconfdir}/udev/scripts/ide-media.sh
%attr(0755,root,root) %{_sysconfdir}/udev/scripts/dvb.sh
+%attr(0755,root,root) %{_sysconfdir}/udev/scripts/udevpermconv.sh
%config %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf
%config %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/50-udev.rules
-%config %attr(0644,root,root) %{_sysconfdir}/udev/permissions.d/50-udev.permissions
%config %attr(0644,root,root) %dir %{_sysconfdir}/udev/makedev.d/50-udev.nodes
@@ -270,6 +271,7 @@
%attr(755,root,root) /sbin/scsi_id
+%attr(755,root,root) /sbin/scsi_id.static
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/scsi_id.config
%attr(0644,root,root) %{_mandir}/man8/scsi_id*.8*
#%attr(755,root,root) /sbin/udev_volume_id
@@ -282,10 +284,14 @@
%attr(0755,root,root) /sbin/udev.get_unique_hardware_path.sh
%attr(0755,root,root) /sbin/udev.get_unique_drive_id.sh
%attr(0644,root,root) %{_sysconfdir}/udev/rules.d/52-udev-s390-persistent.rules
-
%endif
%changelog
+* Mon Apr 11 2005 Harald Hoyer <harald at redhat.com> - 056-1
+- updated to version 056
+- merged permissions in the rules file
+- added udevpermconv.sh to convert old permission files
+
* Mon Mar 28 2005 Warren Togami <wtogami at redhat.com> - 050-10
- own default and net dirs (#151368 Hans de Goede)
More information about the fedora-cvs-commits
mailing list