udev default config layout changes

PATCH Applied Kay Sievers 2 participants 2 messages Apr 22, 2004 – Apr 23, 2004 Kbuild

lore

Share & tools

lore

Kay Sievers

author

2004-04-22 13:50 UTC #0 lore raw

PATCH 1/1 udev default config layout changes

Here we catch up, after the default config changes.

o the man page is updated to reflect the new default config

o /etc/udev/rules.d/ + permissions.d/ dirs are created now

o udev.rules is installed in /etc/udev/rules.d/50-udev.rules so the user can easily order the files by prepending a number. (RedHat has the same name in the last rpm.)

o defined directory names in the Makefile are all without slashes now, not the first half with and the remaining without.

o all binaries are uninstalled now

o leading slashes in config values are now removed or prepended while the config is parsed, so we are more robust if the usere changes something.

o replaced the macros from udev_config.c with real code, cause we can skip if the value matches and not useless iterate over the remaining fields.

o config parsing errors are logged with info() now, fixes the bug where we report a error with debug_parse(), even when there isn't one

thanks,
Kay

===== Makefile 1.156 vs edited =====

Makefile +34 ~~-30~~

@@ -51,9 +51,9 @@
 usrbindir =	${exec_prefix}/usr/bin
 mandir =	${prefix}/usr/share/man
 hotplugdir =	${etcdir}/hotplug.d/default
-configdir =	${etcdir}/udev/
-initdir = 	${etcdir}/init.d/
-dev_ddir =	${etcdir}/dev.d/
+configdir =	${etcdir}/udev
+initdir = 	${etcdir}/init.d
+dev_ddir =	${etcdir}/dev.d
 srcdir = .
 
 INSTALL = /usr/bin/install -c

@@ -228,16 +228,16 @@
 
 # Rules on how to create the generated header files
 udev_version.h:
-	@echo \#define UDEV_VERSION	\"$(VERSION)\" > $@
-	@echo \#define UDEV_ROOT	\"$(udevdir)/\" >> $@
-	@echo \#define UDEV_DB		\"$(udevdir)/\.udev.tdb\" >> $@
-	@echo \#define UDEV_CONFIG_DIR	\"$(configdir)\" >> $@
-	@echo \#define UDEV_CONFIG_FILE	\"$(configdir)\udev.conf\" >> $@
-	@echo \#define UDEV_RULES_FILE	\"$(configdir)\udev.rules\" >> $@
-	@echo \#define UDEV_PERMISSION_FILE	\"$(configdir)\udev.permissions\" >> $@
-	@echo \#define UDEV_LOG_DEFAULT \"yes\" >> $@
-	@echo \#define UDEV_BIN		\"$(DESTDIR)$(sbindir)/udev\" >> $@
-	@echo \#define UDEVD_BIN	\"$(DESTDIR)$(sbindir)/udevd\" >> $@
+	@echo \#define UDEV_VERSION		\"$(VERSION)\" > $@
+	@echo \#define UDEV_ROOT		\"$(udevdir)/\" >> $@
+	@echo \#define UDEV_DB			\"$(udevdir)/.udev.tdb\" >> $@
+	@echo \#define UDEV_CONFIG_DIR		\"$(configdir)\" >> $@
+	@echo \#define UDEV_CONFIG_FILE		\"$(configdir)/udev.conf\" >> $@
+	@echo \#define UDEV_RULES_FILE		\"$(configdir)/rules.d\" >> $@
+	@echo \#define UDEV_PERMISSION_FILE	\"$(configdir)/permissions.d\" >> $@
+	@echo \#define UDEV_LOG_DEFAULT 	\"yes\" >> $@
+	@echo \#define UDEV_BIN			\"$(DESTDIR)$(sbindir)/udev\" >> $@
+	@echo \#define UDEVD_BIN		\"$(DESTDIR)$(sbindir)/udevd\" >> $@
 
 # config files automatically generated
 GEN_CONFIGS =	$(LOCAL_CFG_DIR)/udev.conf

@@ -343,29 +343,29 @@
 	fi
 
 install-config: $(GEN_CONFIGS)
-	$(INSTALL) -d $(DESTDIR)$(configdir)
-	@if [ ! -r $(DESTDIR)$(configdir)udev.conf ]; then \
+	$(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
+	$(INSTALL) -d $(DESTDIR)$(configdir)/permissions.d
+	@if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
 		echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
 		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
 	fi
-	@if [ ! -r $(DESTDIR)$(configdir)udev.rules ]; then \
-		echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir); \
-		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir); \
+	@if [ ! -r $(DESTDIR)$(configdir)/rules.d/50-udev.rules ]; then \
+		echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir)/rules.d/50-udev.rules; \
+		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir)/rules.d/50-udev.rules; \
 	fi
-	@if [ ! -r $(DESTDIR)$(configdir)udev.permissions ]; then \
-		echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir); \
-		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir); \
+	@if [ ! -r $(DESTDIR)$(configdir)/permissions.d/50-udev.permissions ]; then \
+		echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir)/permissions.d/50-udev.permissions; \
+		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir)/permissions.d/50-udev.permissions; \
 	fi
 
 install-dev.d:
-	$(INSTALL) -d $(DESTDIR)$(dev_ddir)
-	$(INSTALL) -d $(DESTDIR)$(dev_ddir)default/
-	$(INSTALL_PROGRAM) -D etc/dev.d/net/hotplug.dev $(DESTDIR)$(dev_ddir)net/hotplug.dev
+	$(INSTALL) -d $(DESTDIR)$(dev_ddir)/default
+	$(INSTALL_PROGRAM) -D etc/dev.d/net/hotplug.dev $(DESTDIR)$(dev_ddir)/net/hotplug.dev
 
 uninstall-dev.d:
-	- rm $(dev_ddir)net/hotplug.dev
-	- rmdir $(dev_ddir)net
-	- rmdir $(dev_ddir)default
+	- rm $(dev_ddir)/net/hotplug.dev
+	- rmdir $(dev_ddir)/net
+	- rmdir $(dev_ddir)/default
 	- rmdir $(dev_ddir)
 
 install-man:

@@ -406,16 +406,20 @@
 
 uninstall: uninstall-man uninstall-dev.d
 	- rm $(hotplugdir)/udev.hotplug
-	- rm $(configdir)/udev.permissions
-	- rm $(configdir)/udev.rules
+	- rm $(configdir)/rules.d/50-udev.rules
+	- rm $(configdir)/permissions.d/50-udev.permissions
 	- rm $(configdir)/udev.conf
+	- rmdir $(configdir)/rules.d
+	- rmdir $(configdir)/permissions.d
+	- rmdir $(configdir)
 	- rm $(initdir)/udev
 	- rm $(sbindir)/$(ROOT)
 	- rm $(sbindir)/$(DAEMON)
 	- rm $(sbindir)/$(SENDER)
+	- rm $(sbindir)/$(STARTER)
 	- rm $(usrbindir)/$(INFO)
+	- rm $(usrbindir)/$(TESTER)
 	- rmdir $(hotplugdir)
-	- rmdir $(configdir)
 	- rm $(udevdir)/.udev.tdb
 	- rmdir $(udevdir)
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \

===== udev.8.in 1.58 vs edited =====

udev.8.in +15 ~~-14~~

@@ -77,7 +77,7 @@
 .B udev_root
 Indicates where to place the device nodes in the filesystem. The default
 value is
-.IR @udevdir@ .
+.IR @udevdir@/ .
 .TP
 .B udev_db
 The name and location of the udev database. The default value is

@@ -87,14 +87,14 @@
 The name of the udev rules file or directory to look for files with the suffix
 .IR .rules .
 All rule files are read in lexical order. The default value is
-.IR /etc/udev/udev.rules .
+.IR /etc/udev/rules.d/ .
 .TP
 .B udev_permissions
 The name of the udev permission file or directory to look for files with the
 suffix
 .IR .permissions .
 All permission files are read in lexical order. The default value is
-.IR /etc/udev/udev.permissions .
+.IR /etc/udev/permissions.d/ .
 .TP
 .B udev_log
 The switch, if udev logs some information for every device handled.

@@ -121,17 +121,17 @@
 .sp
 .nf
 # udev_root - where to place the device nodes in the filesystem
-udev_root="@udevdir@"
+udev_root="/udev"
 
 # udev_db - The name and location of the udev database
-udev_db="@udevdir@/.udev.tdb"
+udev_db="/udev/.udev.tdb"
 
 # udev_rules - The name of the udev rules file or directory to look
                for files with the suffix .rules
 udev_rules="/etc/udev/rules.d/"
 
-# udev_permissions - The name of the udev permission file or directry to look
-                     for files with the suffix .permissions
+# udev_permissions - The name of the udev permission file or directory
+                     to look for files with the suffix .permissions
 udev_permissions="/etc/udev/udev.permissions"
 
 # udev_log - set to "yes" if you want logging, else "no"

@@ -150,14 +150,14 @@
 default_group="root"
 .fi
 .P
-The rules for udev to use when naming devices may specified in
-.I /etc/udev/udev.rules
-or by the
+The rules for device naming, are read from the files located in the
+.I /etc/udev/rules.d/
+directory, or at the location specified by the
 .I udev_rules
 value in the
 .I /etc/udev/udev.conf
 file.
-.P
+.br
 Every line in the rules file defines the mapping between device attributes
 and the device name. One or more keys are specified to match a rule with
 the current device. If all keys are matching, the rule will be applied and

@@ -304,9 +304,10 @@
 BUS="usb", SYSFS{model}="XV3", NAME="video%n", SYMLINK="webcam%n"
 .fi
 .P
-Permissions and ownership for the created device files may specified in
-.I /etc/udev/udev.permissions
-or by the
+The permissions and ownership of the created device file is read from
+the files located in the
+.I /etc/udev/permissions.d/
+directory, or at the location specified by the
 .I udev_permission
 value in the
 .I /etc/udev/udev.conf

===== udev_config.c 1.17 vs edited =====

udev_config.c +64 ~~-40~~

141 lines not on this page · raw message

===== udev_lib.c 1.6 vs edited =====

udev_lib.c +21 -1

@@ -152,6 +152,26 @@
 	return count - cur;
 }
 
+void leading_slash(char *path)
+{
+	int len;
+
+	len = strlen(path);
+	if (len > 0 && path[len-1] != '/') {
+		path[len] = '/';
+		path[len+1] = '\0';
+	}
+}
+
+void no_leading_slash(char *path)
+{
+	int len;
+
+	len = strlen(path);
+	if (len > 0 && path[len-1] == '/')
+		path[len-1] = '\0';
+}
+
 struct files {
 	struct list_head list;
 	char name[NAME_SIZE];

@@ -180,7 +200,7 @@
 	return 0;
 }
 
-/* calls function for file or every file found in directory */
+/* calls function for every file found in specified directory */
 int call_foreach_file(int fnct(char *f) , char *dirname, char *suffix)
 {
 	struct dirent *ent;

===== udev_lib.h 1.5 vs edited =====

udev_lib.h +2 -0

@@ -75,6 +75,8 @@
 extern int file_map(const char *filename, char **buf, size_t *bufsize);
 extern void file_unmap(char *buf, size_t bufsize);
 extern size_t buf_get_line(char *buf, size_t buflen, size_t cur);
+extern void leading_slash(char *path);
+extern void no_leading_slash(char *path);
 extern int  call_foreach_file(int fnct(char *f) , char *filename, char *extension);

Greg KH

Applied

2004-04-23 20:56 UTC #1 lore raw

Quoted 1 line · Kay Sievers

Here we catch up, after the default config changes.

Applied, thanks.

greg k-h

-------------------------------------------------------
This SF.net email is sponsored by: The Robotic Monkeys at ThinkGeek For a limited time only, get FREE Ground shipping on all orders of $35 or more. Hurry up and shop folks, this offer expires April 30th!
http://www.thinkgeek.com/freeshipping/?cpg297
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel