remove default settings in udev.conf

Changing the default values in udev.conf will render allmost
all current systems unusable. So just remove the settings that
can't be changed anyway.

Signed-off-by: Kay Sievers <kay.sievers@suse.de>

diff --git a/etc/udev/udev.conf.in b/etc/udev/udev.conf.in
index a92f688c3a46a49470c7052574a2af25eb34516d..41902c4f06dfc621c9b44d3693bb81643592bf31 100644 (file)
--- a/etc/udev/udev.conf.in
+++ b/etc/udev/udev.conf.in
@@ -1,11 +1,5 @@
 # udev.conf
 
-# Where in the filesystem to place the device nodes.
-udev_root="@udevdir@"
-
-# The name and location of the udev rules file(s).
-udev_rules="@configdir@/rules.d"
-
 # The initial syslog(3) priority: "err", "info", "debug" or its
 # numerical equivalent. For runtime debugging, the daemons internal
 # state can be changed with: "udevcontrol log_priority=<value>".

diff --git a/udev_add.c b/udev_add.c
index 128917e519db9457720fdca27c15ebc9ca32a76c..174474bdc703a1bf0e6adb966979afd5b0635653 100644 (file)
--- a/udev_add.c
+++ b/udev_add.c
@@ -272,8 +272,7 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
                        goto exit;
 
                if (udev_db_add_device(udev) != 0)
-                       dbg("udev_db_add_dev failed, but we create the node anyway, "
-                           "remove might not work for custom names");
+                       dbg("udev_db_add_dev failed, remove might not work for custom names");
 
                /* use full path to the environment */
                snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);