aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--udev.818
-rw-r--r--udev.c4
-rw-r--r--udev.config (renamed from namedev.config)0
-rw-r--r--udev.h6
-rw-r--r--udev.permissions (renamed from namedev.permissions)0
-rw-r--r--udev.spec4
7 files changed, 20 insertions, 20 deletions
diff --git a/Makefile b/Makefile
index 6710ede1..a5c00b71 100644
--- a/Makefile
+++ b/Makefile
@@ -198,14 +198,14 @@ install: all
$(INSTALL) -d $(hotplugdir)
$(INSTALL_PROGRAM) -D $(ROOT) $(sbindir)/$(ROOT)
$(INSTALL_DATA) -D udev.8 $(mandir)/man8/udev.8
- $(INSTALL_DATA) namedev.config $(configdir)
- $(INSTALL_DATA) namedev.permissions $(configdir)
+ $(INSTALL_DATA) udev.config $(configdir)
+ $(INSTALL_DATA) udev.permissions $(configdir)
- ln -s $(sbindir)/$(ROOT) $(hotplugdir)/udev.hotplug
uninstall:
- rm $(hotplugdir)/udev.hotplug
- - rm $(configdir)/namedev.permissions
- - rm $(configdir)/namedev.config
+ - rm $(configdir)/udev.permissions
+ - rm $(configdir)/udev.config
- rm $(mandir)/man8/udev.8
- rm $(sbindir)/$(ROOT)
- rmdir $(hotplugdir)
diff --git a/udev.8 b/udev.8
index 8865a790..42239c82 100644
--- a/udev.8
+++ b/udev.8
@@ -18,16 +18,16 @@ On device creation,
.B udev
reads the sysfs directory of the given device to collect device attributes
like label, serial number or bus device number.
-These attributes are passed as a key to the namedev subsystem
-to receive a unique name for device file creation.
-namedev maintains a database for devices present on the system.
+These attributes are treated as a key
+to determine a unique name for device file creation.
+udev maintains a database for devices present on the system.
.br
On device removal,
.B udev
-queries the namedev database for the name of the device file to be deleted.
+queries the internal database for the name of the device file to be deleted.
.SH "CONFIGURATION"
-namedev expects its configuration at
-.I /etc/udev/namedev.config.
+udev expects its configuration at
+.I /etc/udev/udev.config.
The file consists of a set of lines. All empty lines and
lines beginning with a '#' will be ignored.
.br
@@ -70,7 +70,7 @@ calling external program, that returns a string to match
.br
keys: \fBBUS\fP, \fBPROGRAM\fP, \fBID\fP
.P
-A sample \fInamedev.conf\fP might look like this:
+A sample \fIudev.conf\fP might look like this:
.sp
.nf
# USB printer to be called lp_color
@@ -90,13 +90,13 @@ CALLOUT, PROGRAM="/sbin/dev_id", BUS="pci", ID="V0815", NAME="dev0815"
.fi
.P
Permissions and ownership for the created device files may specified at
-.I /etc/udev/namedev.permissions.
+.I /etc/udev/udev.permissions.
The file consists of a set of lines. All empty lines and
lines beginning with a '#' will be ignored.
.br
Every line lists a device name followed by owner, group and permission mode. All values are separated by colons.
.sp
-A sample \fInamedev.permissions\fP might look like this:
+A sample \fIudev.permissions\fP might look like this:
.sp
.nf
#name:user:group:mode
diff --git a/udev.c b/udev.c
index ed42862c..8746b9a8 100644
--- a/udev.c
+++ b/udev.c
@@ -74,8 +74,8 @@ static void get_dirs(void)
{
char *temp;
char *udev_db = UDEV_DB;
- char *udev_config = NAMEDEV_CONFIG_FILE;
- char *udev_permission = NAMEDEV_CONFIG_PERMISSION_FILE;
+ char *udev_config = UDEV_CONFIG_FILE;
+ char *udev_permission = UDEV_CONFIG_PERMISSION_FILE;
int retval;
retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
diff --git a/namedev.config b/udev.config
index a0c6f9d1..a0c6f9d1 100644
--- a/namedev.config
+++ b/udev.config
diff --git a/udev.h b/udev.h
index 4c8914f1..1f6e981c 100644
--- a/udev.h
+++ b/udev.h
@@ -52,9 +52,9 @@ extern int log_message (int level, const char *format, ...)
/* filenames for the config and database files */
-#define UDEV_DB "udevdb.tdb"
-#define NAMEDEV_CONFIG_PERMISSION_FILE "namedev.permissions"
-#define NAMEDEV_CONFIG_FILE "namedev.config"
+#define UDEV_DB "udev.tdb"
+#define UDEV_CONFIG_PERMISSION_FILE "udev.permissions"
+#define UDEV_CONFIG_FILE "udev.config"
#define NAME_SIZE 100
#define OWNER_SIZE 30
diff --git a/namedev.permissions b/udev.permissions
index 66d8af1f..66d8af1f 100644
--- a/namedev.permissions
+++ b/udev.permissions
diff --git a/udev.spec b/udev.spec
index fd6b488a..ffdfb247 100644
--- a/udev.spec
+++ b/udev.spec
@@ -34,8 +34,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) /sbin/udev
%attr(755,root,root) /udev/
%attr(755,root,root) /etc/udev/
-%attr(0644,root,root) /etc/udev/namedev.config
-%attr(0644,root,root) /etc/udev/namedev.permissions
+%attr(0644,root,root) /etc/udev/udev.config
+%attr(0644,root,root) /etc/udev/udev.permissions
%attr(-,root,root) /etc/hotplug.d/default/udev.hotplug
%attr(0644,root,root) %{_mandir}/man8/udev.8*