From: Kay Sievers <kay.sievers@vrfy.org>
To: linux-hotplug@vger.kernel.org
Subject: Re: [PATCH] hmm, handle net devices with udev?
Date: Wed, 24 Mar 2004 23:12:50 +0000 [thread overview]
Message-ID: <20040324231250.GA28767@vrfy.org> (raw)
In-Reply-To: <20040323030736.GA23908@vrfy.org>
[-- Attachment #1: Type: text/plain, Size: 579 bytes --]
On Wed, Mar 24, 2004 at 10:03:28AM -0800, Greg KH wrote:
> On Tue, Mar 23, 2004 at 04:07:36AM +0100, Kay Sievers wrote:
> > Hmm, Arndt Bergmann sent a patch like this one a few weeks ago and
> > I want to bring the question back, if we want to handle net device
> > naming with udev.
>
> Ok, in looking at this patch, I think we should do this, it's just too
> simple not to :)
>
> I wanted to apply this patch, but there are too many big conflicts with
> the current bk tree. Care to fix up the merge issues and send me a new
> one?
Here is the actual version.
thanks,
Kay
[-- Attachment #2: 01-nameif.patch --]
[-- Type: text/plain, Size: 24084 bytes --]
===== namedev.c 1.135 vs edited =====
--- 1.135/namedev.c Wed Mar 24 18:50:40 2004
+++ edited/namedev.c Wed Mar 24 23:19:12 2004
@@ -836,12 +836,22 @@
}
}
+ /* no rule was found for the net device */
+ if (udev->type == 'n') {
+ dbg("no name for net device '%s' configured", udev->kernel_name);
+ return -1;
+ }
+
/* no rule was found so we use the kernel name */
strfieldcpy(udev->name, udev->kernel_name);
goto done;
found:
apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
+
+ if (udev->type == 'n')
+ return 0;
+
udev->partitions = dev->partitions;
strfieldcpy(udev->config_file, dev->config_file);
udev->config_line = dev->config_line;
===== udev-add.c 1.65 vs edited =====
--- 1.65/udev-add.c Wed Mar 24 22:14:08 2004
+++ edited/udev-add.c Wed Mar 24 23:14:16 2004
@@ -30,6 +30,10 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <grp.h>
+#include <net/if.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <linux/sockios.h>
#ifndef __KLIBC__
#include <pwd.h>
#include <utmp.h>
@@ -342,16 +346,16 @@
/* wait for the "dev" file to show up in the directory in sysfs.
* If it doesn't happen in about 10 seconds, give up.
*/
-#define SECONDS_TO_WAIT_FOR_DEV 10
-static int sleep_for_dev(char *path)
+#define SECONDS_TO_WAIT_FOR_FILE 10
+static int sleep_for_file(char *path, char* file)
{
char filename[SYSFS_PATH_MAX + 6];
- int loop = SECONDS_TO_WAIT_FOR_DEV;
+ int loop = SECONDS_TO_WAIT_FOR_FILE;
int retval;
strfieldcpy(filename, sysfs_path);
strfieldcat(filename, path);
- strfieldcat(filename, "/dev");
+ strfieldcat(filename, file);
while (loop--) {
struct stat buf;
@@ -369,6 +373,30 @@
return retval;
}
+static int rename_net_if(struct udevice *dev)
+{
+ int sk;
+ struct ifreq ifr;
+ int retval;
+
+ sk = socket(PF_INET, SOCK_DGRAM, 0);
+ if (sk < 0) {
+ dbg("error opening socket");
+ return -1;
+ }
+
+ memset(&ifr, 0x00, sizeof(struct ifreq));
+ strfieldcpy(ifr.ifr_name, dev->kernel_name);
+ strfieldcpy(ifr.ifr_newname, dev->name);
+
+ dbg("changing net interface name from '%s' to '%s'", dev->kernel_name, dev->name);
+ retval = ioctl(sk, SIOCSIFNAME, &ifr);
+ if (retval != 0)
+ dbg("error changing net interface name");
+
+ return retval;
+}
+
int udev_add_device(char *path, char *subsystem, int fake)
{
struct sysfs_class_device *class_dev = NULL;
@@ -378,39 +406,61 @@
memset(&dev, 0x00, sizeof(dev));
/* for now, the block layer is the only place where block devices are */
- if (strcmp(subsystem, "block") == 0)
- dev.type = 'b';
- else
- dev.type = 'c';
- retval = sleep_for_dev(path);
- if (retval != 0)
- goto exit;
+ dev.type = get_device_type(path, subsystem);
+
+ switch (dev.type) {
+ case 'b':
+ case 'c':
+ retval = sleep_for_file(path, "/dev");
+ break;
+
+ case 'n':
+ retval = sleep_for_file(path, "/address");
+ break;
+
+ default:
+ dbg("unknown device type '%c'", dev.type);
+ retval = -EINVAL;
+ }
class_dev = get_class_dev(path);
if (class_dev == NULL)
goto exit;
- retval = get_major_minor(class_dev, &dev);
- if (retval != 0) {
- dbg("get_major_minor failed");
- goto exit;
+ if (dev.type == 'b' || dev.type == 'c') {
+ retval = get_major_minor(class_dev, &dev);
+ if (retval != 0) {
+ dbg("get_major_minor failed");
+ goto exit;
+ }
}
retval = namedev_name_device(class_dev, &dev);
if (retval != 0)
goto exit;
- if (!fake) {
+ if (!fake && (dev.type == 'b' || dev.type == 'c')) {
retval = udevdb_add_dev(path, &dev);
if (retval != 0)
dbg("udevdb_add_dev failed, but we are going to try "
"to create the node anyway. But remove might not "
"work properly for this device.");
-
}
+
dbg("name='%s'", dev.name);
- retval = create_node(&dev, fake);
+ switch (dev.type) {
+ case 'b':
+ case 'c':
+ retval = create_node(&dev, fake);
+ break;
+
+ case 'n':
+ retval = rename_net_if(&dev);
+ if (retval != 0)
+ dbg("net device naming failed");
+ break;
+ }
if ((retval == 0) && (!fake))
dev_d_send(&dev, subsystem);
===== udev-remove.c 1.28 vs edited =====
--- 1.28/udev-remove.c Wed Mar 24 22:11:13 2004
+++ edited/udev-remove.c Wed Mar 24 23:34:31 2004
@@ -135,22 +135,38 @@
char *temp;
int retval;
- memset(&dev, 0, sizeof(dev));
+ memset(&dev, 0x00, sizeof(dev));
- retval = udevdb_get_dev(path, &dev);
- if (retval) {
- dbg("'%s' not found in database, falling back on default name", path);
- temp = strrchr(path, '/');
- if (temp == NULL)
- return -ENODEV;
- strfieldcpy(dev.name, &temp[1]);
- }
+ dev.type = get_device_type(path, subsystem);
+
+ switch (dev.type) {
+ case 'b':
+ case 'c':
+ retval = udevdb_get_dev(path, &dev);
+ if (retval) {
+ dbg("'%s' not found in database, falling back on default name", path);
+ temp = strrchr(path, '/');
+ if (temp == NULL)
+ return -ENODEV;
+ strfieldcpy(dev.name, &temp[1]);
+ }
+
+ dbg("name='%s'", dev.name);
+ udevdb_delete_dev(path);
- dbg("name is '%s'", dev.name);
- udevdb_delete_dev(path);
+ dev_d_send(&dev, subsystem);
- dev_d_send(&dev, subsystem);
+ retval = delete_node(&dev);
+ break;
+
+ case 'n':
+ retval = 0;
+ break;
+
+ default:
+ dbg("unknown device type '%c'", dev.type);
+ retval = -EINVAL;
+ }
- retval = delete_node(&dev);
return retval;
}
===== udev.c 1.55 vs edited =====
--- 1.55/udev.c Wed Mar 24 22:11:13 2004
+++ edited/udev.c Wed Mar 24 23:21:41 2004
@@ -68,7 +68,6 @@
}
static char *subsystem_blacklist[] = {
- "net",
"scsi_host",
"scsi_device",
"usb_host",
@@ -85,6 +84,7 @@
int retval = -EINVAL;
int i;
struct sigaction act;
+ const int nofake = 0;
action = get_action();
if (!action) {
@@ -137,23 +137,23 @@
if (strcmp(action, "add") == 0) {
namedev_init();
- retval = udev_add_device(devpath, subsystem, 0);
- } else {
- if (strcmp(action, "remove") == 0) {
- retval = udev_remove_device(devpath, subsystem);
- } else {
- dbg("unknown action '%s'", action);
- retval = -EINVAL;
- }
+ retval = udev_add_device(devpath, subsystem, nofake);
+ goto action_done;
+ }
+
+ if (strcmp(action, "remove") == 0) {
+ retval = udev_remove_device(devpath, subsystem);
+ goto action_done;
}
+ dbg("unknown action '%s'", action);
+ retval = -EINVAL;
+
+action_done:
udevdb_exit();
exit:
- if (retval > 0)
- retval = 0;
-
- return -retval;
+ return retval;
}
int main(int argc, char *argv[], char *envp[])
===== udev_lib.c 1.2 vs edited =====
--- 1.2/udev_lib.c Wed Mar 24 22:11:36 2004
+++ edited/udev_lib.c Wed Mar 24 23:50:34 2004
@@ -81,6 +81,22 @@
return subsystem;
}
+char get_device_type(const char *path, const char *subsystem)
+{
+ if (strcmp(subsystem, "block") == 0 ||
+ strstr(path, "/block/") != NULL)
+ return 'b';
+
+ if (strcmp(subsystem, "net") == 0 ||
+ strstr(path, "/class/net/") != NULL)
+ return 'n';
+
+ if (strstr(path, "/class/") != NULL)
+ return 'c';
+
+ return '\0';
+}
+
int file_map(const char *filename, char **buf, size_t *bufsize)
{
struct stat stats;
===== udev_lib.h 1.2 vs edited =====
--- 1.2/udev_lib.h Wed Mar 24 22:11:36 2004
+++ edited/udev_lib.h Wed Mar 24 23:14:20 2004
@@ -71,6 +71,7 @@
extern char *get_devnode(void);
extern char *get_seqnum(void);
extern char *get_subsystem(char *subsystem);
+extern char get_device_type(const char *path, const char *subsystem);
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);
===== udevinfo.c 1.21 vs edited =====
--- 1.21/udevinfo.c Tue Mar 23 22:40:19 2004
+++ edited/udevinfo.c Wed Mar 24 23:28:42 2004
@@ -138,6 +138,10 @@
struct sysfs_device *sysfs_dev;
struct sysfs_device *sysfs_dev_parent;
int retval = 0;
+ char type;
+
+ type = get_device_type(path, "");
+ dbg("device type is %c", type);
/* get the class dev */
class_dev = sysfs_open_class_device_path(path);
@@ -146,21 +150,23 @@
return -1;
}
- /* read the 'dev' file for major/minor*/
- attr = sysfs_get_classdev_attr(class_dev, "dev");
- if (attr == NULL) {
- printf("couldn't get the \"dev\" file\n");
- retval = -1;
- goto exit;
- }
-
printf("\nudevinfo starts with the device the node belongs to and then walks up the\n"
"device chain, to print for every device found, all possibly useful attributes\n"
"in the udev key format.\n"
"Only attributes within one device section may be used together in one rule,\n"
"to match the device for which the node will be created.\n"
"\n");
- printf("device '%s' has major:minor %s", class_dev->path, attr->value);
+
+ if (type == 'b' || type =='c') {
+ /* read the 'dev' file for major/minor*/
+ attr = sysfs_get_classdev_attr(class_dev, "dev");
+ if (attr == NULL) {
+ printf("couldn't get the \"dev\" file\n");
+ retval = -1;
+ goto exit;
+ }
+ printf("device '%s' has major:minor %s", class_dev->path, attr->value);
+ }
/* open sysfs class device directory and print all attributes */
printf(" looking at class device '%s':\n", class_dev->path);
===== test/udev-test.pl 1.52 vs edited =====
--- 1.52/test/udev-test.pl Fri Mar 12 20:06:01 2004
+++ edited/test/udev-test.pl Wed Mar 24 23:50:17 2004
@@ -35,7 +35,7 @@
{
desc => "label test of scsi disc",
subsys => "block",
- devpath => "block/sda",
+ devpath => "/block/sda",
exp_name => "boot_disk" ,
conf => <<EOF
BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="boot_disk%n"
@@ -45,7 +45,7 @@
{
desc => "label test of scsi partition",
subsys => "block",
- devpath => "block/sda/sda1",
+ devpath => "/block/sda/sda1",
exp_name => "boot_disk1" ,
conf => <<EOF
BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="boot_disk%n"
@@ -54,7 +54,7 @@
{
desc => "label test of pattern match",
subsys => "block",
- devpath => "block/sda/sda1",
+ devpath => "/block/sda/sda1",
exp_name => "boot_disk1" ,
conf => <<EOF
BUS="scsi", SYSFS{vendor}="?IBM-ESXS", NAME="boot_disk%n-1"
@@ -66,7 +66,7 @@
{
desc => "label test of multiple sysfs files",
subsys => "block",
- devpath => "block/sda/sda1",
+ devpath => "/block/sda/sda1",
exp_name => "boot_disk1" ,
conf => <<EOF
BUS="scsi", SYSFS{vendor}="IBM-ESXS", SYSFS{model}="ST336605LW !#", NAME="boot_diskX%n"
@@ -76,7 +76,7 @@
{
desc => "label test of max sysfs files",
subsys => "block",
- devpath => "block/sda/sda1",
+ devpath => "/block/sda/sda1",
exp_name => "boot_disk1" ,
conf => <<EOF
BUS="scsi", SYSFS{vendor}="IBM-ESXS", SYSFS{model}="ST336605LW !#", SYSFS{scsi_level}="4", SYSFS{rev}="B245", SYSFS{type}="2", SYSFS{queue_depth}="32", NAME="boot_diskXX%n"
@@ -86,7 +86,7 @@
{
desc => "catch device by *",
subsys => "tty",
- devpath => "class/tty/ttyUSB0",
+ devpath => "/class/tty/ttyUSB0",
exp_name => "visor/0" ,
conf => <<EOF
KERNEL="ttyUSB*", NAME="visor/%n"
@@ -95,7 +95,7 @@
{
desc => "catch device by * - take 2",
subsys => "tty",
- devpath => "class/tty/ttyUSB0",
+ devpath => "/class/tty/ttyUSB0",
exp_name => "visor/0" ,
conf => <<EOF
KERNEL="*USB1", NAME="bad"
@@ -105,7 +105,7 @@
{
desc => "catch device by ?",
subsys => "tty",
- devpath => "class/tty/ttyUSB0",
+ devpath => "/class/tty/ttyUSB0",
exp_name => "visor/0" ,
conf => <<EOF
KERNEL="ttyUSB??*", NAME="visor/%n-1"
@@ -116,7 +116,7 @@
{
desc => "catch device by character class",
subsys => "tty",
- devpath => "class/tty/ttyUSB0",
+ devpath => "/class/tty/ttyUSB0",
exp_name => "visor/0" ,
conf => <<EOF
KERNEL="ttyUSB[A-Z]*", NAME="visor/%n-1"
@@ -127,7 +127,7 @@
{
desc => "replace kernel name",
subsys => "tty",
- devpath => "class/tty/ttyUSB0",
+ devpath => "/class/tty/ttyUSB0",
exp_name => "visor" ,
conf => <<EOF
KERNEL="ttyUSB0", NAME="visor"
@@ -136,7 +136,7 @@
{
desc => "Handle comment lines in config file (and replace kernel name)",
subsys => "tty",
- devpath => "class/tty/ttyUSB0",
+ devpath => "/class/tty/ttyUSB0",
exp_name => "visor" ,
conf => <<EOF
# this is a comment
@@ -147,7 +147,7 @@
{
desc => "Handle comment lines in config file with whitespace (and replace kernel name)",
subsys => "tty",
- devpath => "class/tty/ttyUSB0",
+ devpath => "/class/tty/ttyUSB0",
exp_name => "visor" ,
conf => <<EOF
# this is a comment with whitespace before the comment
@@ -158,7 +158,7 @@
{
desc => "Handle empty lines in config file (and replace kernel name)",
subsys => "tty",
- devpath => "class/tty/ttyUSB0",
+ devpath => "/class/tty/ttyUSB0",
exp_name => "visor" ,
conf => <<EOF
@@ -169,7 +169,7 @@
{
desc => "subdirectory handling",
subsys => "tty",
- devpath => "class/tty/ttyUSB0",
+ devpath => "/class/tty/ttyUSB0",
exp_name => "sub/direct/ory/visor" ,
conf => <<EOF
KERNEL="ttyUSB0", NAME="sub/direct/ory/visor"
@@ -178,7 +178,7 @@
{
desc => "place on bus of scsi partition",
subsys => "block",
- devpath => "block/sda/sda3",
+ devpath => "/block/sda/sda3",
exp_name => "first_disk3" ,
conf => <<EOF
BUS="scsi", PLACE="0:0:0:0", NAME="first_disk%n"
@@ -187,7 +187,7 @@
{
desc => "test NAME substitution chars",
subsys => "block",
- devpath => "block/sda/sda3",
+ devpath => "/block/sda/sda3",
exp_name => "Major:8:minor:3:kernelnumber:3:bus:0:0:0:0" ,
conf => <<EOF
BUS="scsi", PLACE="0:0:0:0", NAME="Major:%M:minor:%m:kernelnumber:%n:bus:%b"
@@ -196,7 +196,7 @@
{
desc => "test NAME substitution chars (with length limit)",
subsys => "block",
- devpath => "block/sda/sda3",
+ devpath => "/block/sda/sda3",
exp_name => "M8-m3-n3-b0:0-sIBM" ,
conf => <<EOF
BUS="scsi", PLACE="0:0:0:0", NAME="M%M-m%m-n%n-b%3b-s%3s{vendor}"
@@ -205,7 +205,7 @@
{
desc => "old style SYSFS_ attribute",
subsys => "block",
- devpath => "block/sda",
+ devpath => "/block/sda",
exp_name => "good" ,
conf => <<EOF
BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="good"
@@ -214,7 +214,7 @@
{
desc => "sustitution of sysfs value (%s{file})",
subsys => "block",
- devpath => "block/sda",
+ devpath => "/block/sda",
exp_name => "disk-IBM-ESXS-sda" ,
conf => <<EOF
BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="disk-%s{vendor}-%k"
@@ -224,7 +224,7 @@
{
desc => "program result substitution",
subsys => "block",
- devpath => "block/sda/sda3",
+ devpath => "/block/sda/sda3",
exp_name => "special-device-3" ,
conf => <<EOF
BUS="scsi", PROGRAM="/bin/echo -n special-device", RESULT="-special-*", NAME="%c-1-%n"
@@ -237,7 +237,7 @@
{
desc => "program result substitution",
subsys => "block",
- devpath => "block/sda/sda3",
+ devpath => "/block/sda/sda3",
exp_name => "test-0:0:0:0" ,
conf => <<EOF
BUS="scsi", PROGRAM="/bin/echo -n test-%b", RESULT="test-0:0*", NAME="%c"
@@ -246,7 +246,7 @@
{
desc => "program with escaped format char (tricky: callout returns format char!)",
subsys => "block",
- devpath => "block/sda/sda3",
+ devpath => "/block/sda/sda3",
exp_name => "escape-3" ,
conf => <<EOF
BUS="scsi", PROGRAM="/bin/echo -n escape-%%n", KERNEL="sda3", NAME="%c"
@@ -255,7 +255,7 @@
{
desc => "program with lots of arguments",
subsys => "block",
- devpath => "block/sda/sda3",
+ devpath => "/block/sda/sda3",
exp_name => "foo9" ,
conf => <<EOF
BUS="scsi", PROGRAM="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL="sda3", NAME="%c{7}"
@@ -264,7 +264,7 @@
{
desc => "program with subshell",
subsys => "block",
- devpath => "block/sda/sda3",
+ devpath => "/block/sda/sda3",
exp_name => "bar9" ,
conf => <<EOF
BUS="scsi", PROGRAM="/bin/sh -c 'echo foo3 foo4 foo5 foo6 foo7 foo8 foo9 | sed s/foo9/bar9/'", KERNEL="sda3", NAME="%c{7}"
@@ -273,7 +273,7 @@
{
desc => "program arguments combined with apostrophes",
subsys => "block",
- devpath => "block/sda/sda3",
+ devpath => "/block/sda/sda3",
exp_name => "foo7" ,
conf => <<EOF
BUS="scsi", PROGRAM="/bin/echo -n 'foo3 foo4' 'foo5 foo6 foo7 foo8'", KERNEL="sda3", NAME="%c{5}"
@@ -282,7 +282,7 @@
{
desc => "characters before the %c{N} substitution",
subsys => "block",
- devpath => "block/sda/sda3",
+ devpath => "/block/sda/sda3",
exp_name => "my-foo9" ,
conf => <<EOF
BUS="scsi", PROGRAM="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL="sda3", NAME="my-%c{7}"
@@ -291,7 +291,7 @@
{
desc => "substitute the second to last argument",
subsys => "block",
- devpath => "block/sda/sda3",
+ devpath => "/block/sda/sda3",
exp_name => "my-foo8" ,
conf => <<EOF
BUS="scsi", PROGRAM="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL="sda3", NAME="my-%c{6}"
@@ -300,7 +300,7 @@
{
desc => "program result substitution (numbered part of)",
subsys => "block",
- devpath => "block/sda/sda3",
+ devpath => "/block/sda/sda3",
exp_name => "link1" ,
conf => <<EOF
BUS="scsi", PROGRAM="/bin/echo -n node link1 link2", RESULT="node *", NAME="%c{1}", SYMLINK="%c{2} %c{3}"
@@ -309,7 +309,7 @@
{
desc => "program result substitution (numbered part of+)",
subsys => "block",
- devpath => "block/sda/sda3",
+ devpath => "/block/sda/sda3",
exp_name => "link3" ,
conf => <<EOF
BUS="scsi", PROGRAM="/bin/echo -n node link1 link2 link3 link4", RESULT="node *", NAME="%c{1}", SYMLINK="%c{2+}"
@@ -318,7 +318,7 @@
{
desc => "invalid program for device with no bus",
subsys => "tty",
- devpath => "class/tty/console",
+ devpath => "/class/tty/console",
exp_name => "TTY" ,
conf => <<EOF
BUS="scsi", PROGRAM="/bin/echo -n foo", RESULT="foo", NAME="foo"
@@ -328,7 +328,7 @@
{
desc => "valid program for device with no bus",
subsys => "tty",
- devpath => "class/tty/console",
+ devpath => "/class/tty/console",
exp_name => "foo" ,
conf => <<EOF
PROGRAM="/bin/echo -n foo", RESULT="foo", NAME="foo"
@@ -338,7 +338,7 @@
{
desc => "invalid label for device with no bus",
subsys => "tty",
- devpath => "class/tty/console",
+ devpath => "/class/tty/console",
exp_name => "TTY" ,
conf => <<EOF
BUS="foo", SYSFS{dev}="5:1", NAME="foo"
@@ -348,7 +348,7 @@
{
desc => "valid label for device with no bus",
subsys => "tty",
- devpath => "class/tty/console",
+ devpath => "/class/tty/console",
exp_name => "foo" ,
conf => <<EOF
SYSFS{dev}="5:1", NAME="foo"
@@ -358,7 +358,7 @@
{
desc => "program and bus type match",
subsys => "block",
- devpath => "block/sda",
+ devpath => "/block/sda",
exp_name => "scsi-0:0:0:0" ,
conf => <<EOF
BUS="usb", PROGRAM="/bin/echo -n usb-%b", NAME="%c"
@@ -369,7 +369,7 @@
{
desc => "symlink creation (same directory)",
subsys => "tty",
- devpath => "class/tty/ttyUSB0",
+ devpath => "/class/tty/ttyUSB0",
exp_name => "visor0" ,
conf => <<EOF
KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="visor%n"
@@ -378,7 +378,7 @@
{
desc => "symlink creation (relative link back)",
subsys => "block",
- devpath => "block/sda/sda2",
+ devpath => "/block/sda/sda2",
exp_name => "1/2/a/b/symlink" ,
conf => <<EOF
BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="1/2/node", SYMLINK="1/2/a/b/symlink"
@@ -387,7 +387,7 @@
{
desc => "symlink creation (relative link forward)",
subsys => "block",
- devpath => "block/sda/sda2",
+ devpath => "/block/sda/sda2",
exp_name => "1/2/symlink" ,
conf => <<EOF
BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/symlink"
@@ -396,7 +396,7 @@
{
desc => "symlink creation (relative link back and forward)",
subsys => "block",
- devpath => "block/sda/sda2",
+ devpath => "/block/sda/sda2",
exp_name => "1/2/c/d/symlink" ,
conf => <<EOF
BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/c/d/symlink"
@@ -405,7 +405,7 @@
{
desc => "multiple symlinks",
subsys => "tty",
- devpath => "class/tty/ttyUSB0",
+ devpath => "/class/tty/ttyUSB0",
exp_name => "second-0" ,
conf => <<EOF
KERNEL="ttyUSB0", NAME="visor", SYMLINK="first-%n second-%n third-%n"
@@ -414,7 +414,7 @@
{
desc => "create all possible partitions",
subsys => "block",
- devpath => "block/sda",
+ devpath => "/block/sda",
exp_name => "boot_disk15" ,
conf => <<EOF
BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME{all_partitions}="boot_disk"
@@ -423,7 +423,7 @@
{
desc => "sysfs parent hierarchy",
subsys => "tty",
- devpath => "class/tty/ttyUSB0",
+ devpath => "/class/tty/ttyUSB0",
exp_name => "visor" ,
conf => <<EOF
SYSFS{idProduct}="2008", NAME="visor"
@@ -432,7 +432,7 @@
{
desc => "name test with ! in the name",
subsys => "block",
- devpath => "block/rd!c0d0",
+ devpath => "/block/rd!c0d0",
exp_name => "rd/c0d0" ,
conf => <<EOF
BUS="scsi", NAME="%k"
@@ -442,7 +442,7 @@
{
desc => "name test with ! in the name, but no matching rule",
subsys => "block",
- devpath => "block/rd!c0d0",
+ devpath => "/block/rd!c0d0",
exp_name => "rd/c0d0" ,
conf => <<EOF
KERNEL="ttyUSB0", NAME="visor"
@@ -451,7 +451,7 @@
{
desc => "ID rule",
subsys => "block",
- devpath => "block/sda",
+ devpath => "/block/sda",
exp_name => "scsi-0:0:0:0",
conf => <<EOF
BUS="usb", ID="0:0:0:0", NAME="not-scsi"
@@ -464,7 +464,7 @@
{
desc => "ID wildcard all",
subsys => "block",
- devpath => "block/sda",
+ devpath => "/block/sda",
exp_name => "scsi-0:0:0:0",
conf => <<EOF
BUS="scsi", ID="*:1", NAME="no-match"
@@ -477,7 +477,7 @@
{
desc => "ID wildcard partial",
subsys => "block",
- devpath => "block/sda",
+ devpath => "/block/sda",
exp_name => "scsi-0:0:0:0",
conf => <<EOF
BUS="scsi", ID="*:0", NAME="scsi-0:0:0:0"
@@ -487,7 +487,7 @@
{
desc => "ID wildcard partial 2",
subsys => "block",
- devpath => "block/sda",
+ devpath => "/block/sda",
exp_name => "scsi-0:0:0:0",
conf => <<EOF
BUS="scsi", ID="*:0:0:0", NAME="scsi-0:0:0:0"
@@ -497,7 +497,7 @@
{
desc => "ignore SYSFS attribute whitespace",
subsys => "block",
- devpath => "block/sda",
+ devpath => "/block/sda",
exp_name => "ignored",
conf => <<EOF
BUS="scsi", SYSFS{whitespace_test}="WHITE SPACE", NAME="ignored"
@@ -506,7 +506,7 @@
{
desc => "do not ignore SYSFS attribute whitespace",
subsys => "block",
- devpath => "block/sda",
+ devpath => "/block/sda",
exp_name => "matched-with-space",
conf => <<EOF
BUS="scsi", SYSFS{whitespace_test}="WHITE SPACE ", NAME="wrong-to-ignore"
@@ -516,7 +516,7 @@
{
desc => "SYMLINK only rule",
subsys => "block",
- devpath => "block/sda",
+ devpath => "/block/sda",
exp_name => "symlink-only2",
conf => <<EOF
BUS="scsi", KERNEL="sda", SYMLINK="symlink-only1"
@@ -527,7 +527,7 @@
{
desc => "permissions test",
subsys => "block",
- devpath => "block/sda",
+ devpath => "/block/sda",
exp_name => "node",
exp_perms => "5000::0444",
conf => <<EOF
@@ -537,7 +537,7 @@
{
desc => "major/minor number test",
subsys => "block",
- devpath => "block/sda",
+ devpath => "/block/sda",
exp_name => "node",
exp_majorminor => "8:0",
conf => <<EOF
@@ -547,7 +547,7 @@
{
desc => "big minor number test",
subsys => "i2c-dev",
- devpath => "class/i2c-dev/i2c-300",
+ devpath => "/class/i2c-dev/i2c-300",
exp_name => "node",
exp_majorminor => "89:300",
conf => <<EOF
@@ -557,7 +557,7 @@
{
desc => "big major number test",
subsys => "i2c-dev",
- devpath => "class/i2c-dev/i2c-fake1",
+ devpath => "/class/i2c-dev/i2c-fake1",
exp_name => "node",
exp_majorminor => "4095:1",
conf => <<EOF
@@ -567,7 +567,7 @@
{
desc => "big major and big minor number test",
subsys => "i2c-dev",
- devpath => "class/i2c-dev/i2c-fake2",
+ devpath => "/class/i2c-dev/i2c-fake2",
exp_name => "node",
exp_majorminor => "4094:89999",
conf => <<EOF
next prev parent reply other threads:[~2004-03-24 23:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-03-23 3:07 [PATCH] hmm, handle net devices with udev? Kay Sievers
2004-03-23 19:43 ` Marco d'Itri
2004-03-24 18:03 ` Greg KH
2004-03-24 23:12 ` Kay Sievers [this message]
2004-03-24 23:33 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040324231250.GA28767@vrfy.org \
--to=kay.sievers@vrfy.org \
--cc=linux-hotplug@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).