diff --git a/namedev.c b/namedev.c index b9d8a3db2c..f2aea34719 100644 --- a/namedev.c +++ b/namedev.c @@ -836,12 +836,22 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud } } + /* 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; diff --git a/test/udev-test.pl b/test/udev-test.pl index d93ebb9cc3..8ae01c31d4 100644 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -35,7 +35,7 @@ my @tests = ( { desc => "label test of scsi disc", subsys => "block", - devpath => "block/sda", + devpath => "/block/sda", exp_name => "boot_disk" , conf => < "label test of scsi partition", subsys => "block", - devpath => "block/sda/sda1", + devpath => "/block/sda/sda1", exp_name => "boot_disk1" , conf => < "label test of pattern match", subsys => "block", - devpath => "block/sda/sda1", + devpath => "/block/sda/sda1", exp_name => "boot_disk1" , conf => < "label test of multiple sysfs files", subsys => "block", - devpath => "block/sda/sda1", + devpath => "/block/sda/sda1", exp_name => "boot_disk1" , conf => < "label test of max sysfs files", subsys => "block", - devpath => "block/sda/sda1", + devpath => "/block/sda/sda1", exp_name => "boot_disk1" , conf => < "catch device by *", subsys => "tty", - devpath => "class/tty/ttyUSB0", + devpath => "/class/tty/ttyUSB0", exp_name => "visor/0" , conf => < "catch device by * - take 2", subsys => "tty", - devpath => "class/tty/ttyUSB0", + devpath => "/class/tty/ttyUSB0", exp_name => "visor/0" , conf => < "catch device by ?", subsys => "tty", - devpath => "class/tty/ttyUSB0", + devpath => "/class/tty/ttyUSB0", exp_name => "visor/0" , conf => < "catch device by character class", subsys => "tty", - devpath => "class/tty/ttyUSB0", + devpath => "/class/tty/ttyUSB0", exp_name => "visor/0" , conf => < "replace kernel name", subsys => "tty", - devpath => "class/tty/ttyUSB0", + devpath => "/class/tty/ttyUSB0", exp_name => "visor" , conf => < "Handle comment lines in config file (and replace kernel name)", subsys => "tty", - devpath => "class/tty/ttyUSB0", + devpath => "/class/tty/ttyUSB0", exp_name => "visor" , conf => < "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 => < "Handle empty lines in config file (and replace kernel name)", subsys => "tty", - devpath => "class/tty/ttyUSB0", + devpath => "/class/tty/ttyUSB0", exp_name => "visor" , conf => < "subdirectory handling", subsys => "tty", - devpath => "class/tty/ttyUSB0", + devpath => "/class/tty/ttyUSB0", exp_name => "sub/direct/ory/visor" , conf => < "place on bus of scsi partition", subsys => "block", - devpath => "block/sda/sda3", + devpath => "/block/sda/sda3", exp_name => "first_disk3" , conf => < "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 => < "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 => < "old style SYSFS_ attribute", subsys => "block", - devpath => "block/sda", + devpath => "/block/sda", exp_name => "good" , conf => < "sustitution of sysfs value (%s{file})", subsys => "block", - devpath => "block/sda", + devpath => "/block/sda", exp_name => "disk-IBM-ESXS-sda" , conf => < "program result substitution", subsys => "block", - devpath => "block/sda/sda3", + devpath => "/block/sda/sda3", exp_name => "special-device-3" , conf => < "program result substitution", subsys => "block", - devpath => "block/sda/sda3", + devpath => "/block/sda/sda3", exp_name => "test-0:0:0:0" , conf => < "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 => < "program with lots of arguments", subsys => "block", - devpath => "block/sda/sda3", + devpath => "/block/sda/sda3", exp_name => "foo9" , conf => < "program with subshell", subsys => "block", - devpath => "block/sda/sda3", + devpath => "/block/sda/sda3", exp_name => "bar9" , conf => < "program arguments combined with apostrophes", subsys => "block", - devpath => "block/sda/sda3", + devpath => "/block/sda/sda3", exp_name => "foo7" , conf => < "characters before the %c{N} substitution", subsys => "block", - devpath => "block/sda/sda3", + devpath => "/block/sda/sda3", exp_name => "my-foo9" , conf => < "substitute the second to last argument", subsys => "block", - devpath => "block/sda/sda3", + devpath => "/block/sda/sda3", exp_name => "my-foo8" , conf => < "program result substitution (numbered part of)", subsys => "block", - devpath => "block/sda/sda3", + devpath => "/block/sda/sda3", exp_name => "link1" , conf => < "program result substitution (numbered part of+)", subsys => "block", - devpath => "block/sda/sda3", + devpath => "/block/sda/sda3", exp_name => "link3" , conf => < "invalid program for device with no bus", subsys => "tty", - devpath => "class/tty/console", + devpath => "/class/tty/console", exp_name => "TTY" , conf => < "valid program for device with no bus", subsys => "tty", - devpath => "class/tty/console", + devpath => "/class/tty/console", exp_name => "foo" , conf => < "invalid label for device with no bus", subsys => "tty", - devpath => "class/tty/console", + devpath => "/class/tty/console", exp_name => "TTY" , conf => < "valid label for device with no bus", subsys => "tty", - devpath => "class/tty/console", + devpath => "/class/tty/console", exp_name => "foo" , conf => < "program and bus type match", subsys => "block", - devpath => "block/sda", + devpath => "/block/sda", exp_name => "scsi-0:0:0:0" , conf => < "symlink creation (same directory)", subsys => "tty", - devpath => "class/tty/ttyUSB0", + devpath => "/class/tty/ttyUSB0", exp_name => "visor0" , conf => < "symlink creation (relative link back)", subsys => "block", - devpath => "block/sda/sda2", + devpath => "/block/sda/sda2", exp_name => "1/2/a/b/symlink" , conf => < "symlink creation (relative link forward)", subsys => "block", - devpath => "block/sda/sda2", + devpath => "/block/sda/sda2", exp_name => "1/2/symlink" , conf => < "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 => < "multiple symlinks", subsys => "tty", - devpath => "class/tty/ttyUSB0", + devpath => "/class/tty/ttyUSB0", exp_name => "second-0" , conf => < "create all possible partitions", subsys => "block", - devpath => "block/sda", + devpath => "/block/sda", exp_name => "boot_disk15" , conf => < "sysfs parent hierarchy", subsys => "tty", - devpath => "class/tty/ttyUSB0", + devpath => "/class/tty/ttyUSB0", exp_name => "visor" , conf => < "name test with ! in the name", subsys => "block", - devpath => "block/rd!c0d0", + devpath => "/block/rd!c0d0", exp_name => "rd/c0d0" , conf => < "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 => < "ID rule", subsys => "block", - devpath => "block/sda", + devpath => "/block/sda", exp_name => "scsi-0:0:0:0", conf => < "ID wildcard all", subsys => "block", - devpath => "block/sda", + devpath => "/block/sda", exp_name => "scsi-0:0:0:0", conf => < "ID wildcard partial", subsys => "block", - devpath => "block/sda", + devpath => "/block/sda", exp_name => "scsi-0:0:0:0", conf => < "ID wildcard partial 2", subsys => "block", - devpath => "block/sda", + devpath => "/block/sda", exp_name => "scsi-0:0:0:0", conf => < "ignore SYSFS attribute whitespace", subsys => "block", - devpath => "block/sda", + devpath => "/block/sda", exp_name => "ignored", conf => < "do not ignore SYSFS attribute whitespace", subsys => "block", - devpath => "block/sda", + devpath => "/block/sda", exp_name => "matched-with-space", conf => < "SYMLINK only rule", subsys => "block", - devpath => "block/sda", + devpath => "/block/sda", exp_name => "symlink-only2", conf => < "permissions test", subsys => "block", - devpath => "block/sda", + devpath => "/block/sda", exp_name => "node", exp_perms => "5000::0444", conf => < "major/minor number test", subsys => "block", - devpath => "block/sda", + devpath => "/block/sda", exp_name => "node", exp_majorminor => "8:0", conf => < "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 => < "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 => < "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 => < #include #include +#include +#include +#include +#include #ifndef __KLIBC__ #include #include @@ -342,16 +346,16 @@ exit: /* 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 @@ exit: 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 @@ int udev_add_device(char *path, char *subsystem, int fake) 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); diff --git a/udev-remove.c b/udev-remove.c index 41636b684e..98c45d6c33 100644 --- a/udev-remove.c +++ b/udev-remove.c @@ -135,22 +135,38 @@ int udev_remove_device(char *path, char *subsystem) 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); + + 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; } - dbg("name is '%s'", dev.name); - udevdb_delete_dev(path); - - dev_d_send(&dev, subsystem); - - retval = delete_node(&dev); return retval; } diff --git a/udev.c b/udev.c index 52b98c8d45..192bed97d8 100644 --- a/udev.c +++ b/udev.c @@ -68,7 +68,6 @@ static void sig_handler(int signum) } static char *subsystem_blacklist[] = { - "net", "scsi_host", "scsi_device", "usb_host", @@ -85,6 +84,7 @@ static int udev_hotplug(void) int retval = -EINVAL; int i; struct sigaction act; + const int nofake = 0; action = get_action(); if (!action) { @@ -137,23 +137,23 @@ static int udev_hotplug(void) 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[]) diff --git a/udev_lib.c b/udev_lib.c index f095513c97..4a9eea506c 100644 --- a/udev_lib.c +++ b/udev_lib.c @@ -81,6 +81,22 @@ char *get_subsystem(char *subsystem) 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; diff --git a/udev_lib.h b/udev_lib.h index 5db6b5261a..90a42ffe96 100644 --- a/udev_lib.h +++ b/udev_lib.h @@ -71,6 +71,7 @@ extern char *get_devpath(void); 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); diff --git a/udevinfo.c b/udevinfo.c index 800882eb1a..b23f9d0aef 100644 --- a/udevinfo.c +++ b/udevinfo.c @@ -138,6 +138,10 @@ static int print_device_chain(const char *path) 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 @@ static int print_device_chain(const char *path) 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);