allow to specify node permissions in the rule
PATCH 1/1 allow to specify node permissions in the rule
This allows to set the permissions along with the rule.
This is not a general replacement for the permissions config, but it may be easier sometimes for the user to specify the permissions along with the rule, cause the permissions config file wants the final node name to match, which seems sometimes a bit difficult to guess, if format % chars are used in the NAME field.
Any value not given in the rule is still be read from the permissions file or set to the default. This one will also work:
BUS="usb", KERNEL="video*", NAME="my-%k", OWNER="$local"
A few words to man page are also added and add_perm_dev() is moved into namedev_parse.c where it belongs to.
thanks,
Kay
===== namedev.c 1.126 vs edited =====
namedev.c +16 -42
@@ -46,6 +46,7 @@LIST_HEAD (config_device_list);LIST_HEAD (perm_device_list); +/* compare string with pattern (supports * ? [0-9] [!A-Z]) */ static int strcmp_pattern (const char *p,const char *s) {
@@ -99,39 +100,6 @@return 1 ; } -#define copy_var (a, b, var) \ - if (b->var) \ - a->var = b->var; - -#define copy_string (a, b, var) \ - if (strlen(b->var)) \ - strcpy(a->var, b->var); - -int add_perm_dev (struct perm_device *new_dev) -{ -struct perm_device *dev; -struct perm_device *tmp_dev; - -/* update the values if we already have the device */ -list_for_each_entry (dev, &perm_device_list, node) { -if (strcmp (new_dev->name, dev->name)) -continue ; -copy_var (dev, new_dev, mode); -copy_string (dev, new_dev, owner); -copy_string (dev, new_dev, group); -return 0 ; - } - -/* not found, add new structure to the perm list */ - tmp_dev =malloc (sizeof (*tmp_dev)); -if (!tmp_dev) -return -ENOMEM ; -memcpy (tmp_dev, new_dev,sizeof (*tmp_dev)); -list_add_tail (&tmp_dev->node, &perm_device_list); -//dump_perm_dev(tmp_dev); -return 0 ; -} -static struct perm_device *find_perm (char *name) {struct perm_device *perm;
@@ -865,22 +833,28 @@ goto done; found: -/* substitute placeholder */ apply_format (udev, udev->name,sizeof (udev->name), class_dev, sysfs_device); udev->partitions = dev->partitions; + done: +/* get permissions given in rule */ +set_empty_perms (udev, dev->mode, + dev->owner, + dev->group); + +/* get permissions given in config file or set defaults */ perm =find_perm (udev->name); -if (perm) { - udev->mode = perm->mode; -strfieldcpy (udev->owner, perm->owner); -strfieldcpy (udev->group, perm->group); +if (perm !=NULL ) { +set_empty_perms (udev, perm->mode, + perm->owner, + perm->group); }else { -/* no matching perms found :( */ - udev->mode =get_default_mode (); -strfieldcpy (udev->owner,get_default_owner ()); -strfieldcpy (udev->group,get_default_group ()); +set_empty_perms (udev,get_default_mode (), +get_default_owner (), +get_default_group ()); } +dbg ("name, '%s' is going to have owner='%s', group='%s', mode = %#o" , udev->name, udev->owner, udev->group, udev->mode);
===== namedev.h 1.27 vs edited =====
namedev.h +14 -1
@@ -44,6 +44,9 @@#define FIELD_KERNEL "KERNEL"#define FIELD_NAME "NAME"#define FIELD_SYMLINK "SYMLINK" +#define FIELD_OWNER "OWNER" +#define FIELD_GROUP "GROUP" +#define FIELD_MODE "MODE"#define ATTR_PARTITIONS "all_partitions"#define PARTITIONS_COUNT 15
@@ -54,6 +57,14 @@#define RULEFILE_EXT ".rules"#define PERMFILE_EXT ".permissions" +#define set_empty_perms (dev, m, o, g) \ + if (dev->mode == 0) \ + dev->mode = m; \ + if (dev->owner[0] == '\0') \ + strfieldcpy(dev->owner, o); \ + if (dev->group[0] == '\0') \ + strfieldcpy(dev->group, g); +struct sysfs_pair {char file[FILE_SIZE ];char value[VALUE_SIZE ];
@@ -71,6 +82,9 @@char name[NAME_SIZE ];char symlink[NAME_SIZE ];struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS ]; +char owner[OWNER_SIZE ]; +char group[GROUP_SIZE ]; +unsigned int mode;int partitions;char config_file[NAME_SIZE ];int config_line;
@@ -93,7 +107,6 @@extern int namedev_init_permissions (void );extern int namedev_init_rules (void ); -extern int add_perm_dev (struct perm_device *new_dev);extern void dump_config_dev (struct config_device *dev);extern void dump_config_dev_list (void );extern void dump_perm_dev (struct perm_device *dev);
===== namedev_parse.c 1.30 vs edited =====
namedev_parse.c +48 -6
95 lines not on this page · raw message
===== udev.8 1.51 vs edited =====
udev.8 +4 -0
@@ -220,6 +220,10 @@ This makes it possible to specify additional symlinks in a possibly separate rules file, while the device nodes are maintained by the distribution provided rules file. +.TP +.B OWNER, GROUP, MODE +The permissions for this device. Every specified value overwrites the value +given in the permissions file. .P .RB "The " NAME " ," SYMLINK " and " PROGRAM fields support simple printf-like string substitution:
Quoted 8 lines · Kay Sievers
This allows to set the permissions along with the rule.
This is not a general replacement for the permissions config, but it may be easier sometimes for the user to specify the permissions along with the rule, cause the permissions config file wants the final node name to match, which seems sometimes a bit difficult to guess, if format % chars are used in the NAME field.
Quoted 7 lines
Any value not given in the rule is still be read from the permissions file or set to the default. This one will also work:
BUS="usb", KERNEL="video*", NAME="my-%k", OWNER="$local"
A few words to man page are also added and
add_perm_dev()is moved intonamedev_parse.cwhere it belongs to.
Hm, as enough people have asked for something like this, I've applied it.
Any chance on being able to add a test for this kind of stuff to the udev-test.pl script?
thanks,
greg k-h
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id70&alloc_id638&op=click
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
Quoted 14 lines · Greg KH
Quoted 13 lines · Kay Sievers
This allows to set the permissions along with the rule.
This is not a general replacement for the permissions config, but it may be easier sometimes for the user to specify the permissions along with the rule, cause the permissions config file wants the final node name to match, which seems sometimes a bit difficult to guess, if format % chars are used in the NAME field.
Any value not given in the rule is still be read from the permissions file or set to the default. This one will also work:
BUS="usb", KERNEL="video*", NAME="my-%k", OWNER="$local"
Quoted 8 lines
Quoted 2 lines
A few words to man page are also added and
add_perm_dev()is moved intonamedev_parse.cwhere it belongs to.Hm, as enough people have asked for something like this, I've applied it.
Any chance on being able to add a test for this kind of stuff to the udev-test.pl script?
Sure, not brilliant but seems to work :)
Only numeric id's are supported so far.
Kay
===== test/udev-test.pl 1.45 vs edited =====
test/udev-test.pl +30 -0
@@ -524,6 +524,16 @@ BUS="scsi", KERNEL="sda", NAME="link", SYMLINK="symlink0" EOF }, + { + desc => "permissions test", + subsys => "block", + devpath => "block/sda", + expected => "node", + perms => "5000::0444", + conf => <<EOF +BUS="scsi", KERNEL="sda", NAME="node", OWNER="5000", MODE="0444" +EOF + }, ); # set env
@@ -556,6 +566,26 @@ udev("add", $config->{subsys}, $config->{devpath}, \$config->{conf}); if (-e "$PWD/$udev_root$config->{expected}") { + if (defined($config->{perms})) { + my $wrong = 0; + my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size, + $atime, $mtime, $ctime, $blksize, $blocks) = stat("$PWD/$udev_root$config->{expected}"); + + $config->{perms} =~ m/^(.*):(.*):(.*)$/; + if ($1 ne "") { + if ($uid != $1) { $wrong = 1; }; + } + if ($2 ne "") { + if ($gid != $2) { $wrong = 1; }; + } + if ($3 ne "") { + if (($mode & 07777) != oct($3)) { $wrong = 1; }; + } + if ($wrong == 1) { + printf "expected permissions are: %i:%i:%#o\n", $1, $2, oct($3); + printf "created permissions are : %i:%i:%#o\n", $uid, $gid, $mode & 07777; + } + } print "add: ok "; } else { print "add: error\n";
Quoted 5 lines · Kay Sievers
Quoted 2 lines
Any chance on being able to add a test for this kind of stuff to the udev-test.pl script?
Sure, not brilliant but seems to work :)
Only numeric id's are supported so far.
Nice, that's a good start. Now we need to check the major:minor values too somehow...
thanks,
greg k-h
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id70&alloc_id638&op=click
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
Quoted 9 lines · Greg KH
Quoted 5 lines · Kay Sievers
Quoted 2 lines
Any chance on being able to add a test for this kind of stuff to the udev-test.pl script?
Sure, not brilliant but seems to work :)
Only numeric id's are supported so far.Nice, that's a good start. Now we need to check the major:minor values too somehow...
I better do it immediately, before you put it in the empty TODO :)
Patch is a bit big, cause spaces are changed to tabs to get space for the longer names.
Kay
===== test/udev-test.pl 1.46 vs edited =====
test/udev-test.pl +295 -264
@@ -33,30 +33,30 @@ my @tests = ( { - desc => "label test of scsi disc", - subsys => "block", - devpath => "block/sda", - expected => "boot_disk" , - conf => <<EOF + desc => "label test of scsi disc", + subsys => "block", + devpath => "block/sda", + exp_name=> "boot_disk" , + conf => <<EOF BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="boot_disk%n" KERNEL="ttyUSB0", NAME="visor" EOF }, { - desc => "label test of scsi partition", - subsys => "block", - devpath => "block/sda/sda1", - expected => "boot_disk1" , - conf => <<EOF + desc => "label test of scsi partition", + subsys => "block", + devpath => "block/sda/sda1", + exp_name=> "boot_disk1" , + conf => <<EOF BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="boot_disk%n" EOF }, { - desc => "label test of pattern match", - subsys => "block", - devpath => "block/sda/sda1", - expected => "boot_disk1" , - conf => <<EOF + desc => "label test of pattern match", + subsys => "block", + devpath => "block/sda/sda1", + exp_name=> "boot_disk1" , + conf => <<EOF BUS="scsi", SYSFS{vendor}="?IBM-ESXS", NAME="boot_disk%n-1" BUS="scsi", SYSFS{vendor}="IBM-ESXS?", NAME="boot_disk%n-2" BUS="scsi", SYSFS{vendor}="IBM-ES??", NAME="boot_disk%n"
@@ -64,169 +64,169 @@ EOF }, { - desc => "label test of multiple sysfs files", - subsys => "block", - devpath => "block/sda/sda1", - expected => "boot_disk1" , - conf => <<EOF + desc => "label test of multiple sysfs files", + subsys => "block", + devpath => "block/sda/sda1", + exp_name => "boot_disk1" , + conf => <<EOF BUS="scsi", SYSFS{vendor}="IBM-ESXS", SYSFS{model}="ST336605LW !#", NAME="boot_diskX%n" BUS="scsi", SYSFS{vendor}="IBM-ESXS", SYSFS{model}="ST336605LW !#", NAME="boot_disk%n" EOF }, { - desc => "label test of max sysfs files", - subsys => "block", - devpath => "block/sda/sda1", - expected => "boot_disk1" , - conf => <<EOF + desc => "label test of max sysfs files", + subsys => "block", + 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" BUS="scsi", SYSFS{vendor}="IBM-ESXS", SYSFS{model}="ST336605LW !#", SYSFS{scsi_level}="4", SYSFS{rev}="B245", SYSFS{type}="0", NAME="boot_disk%n" EOF }, { - desc => "catch device by *", - subsys => "tty", - devpath => "class/tty/ttyUSB0", - expected => "visor/0" , - conf => <<EOF + desc => "catch device by *", + subsys => "tty", + devpath => "class/tty/ttyUSB0", + exp_name => "visor/0" , + conf => <<EOF KERNEL="ttyUSB*", NAME="visor/%n" EOF }, { - desc => "catch device by * - take 2", - subsys => "tty", - devpath => "class/tty/ttyUSB0", - expected => "visor/0" , - conf => <<EOF + desc => "catch device by * - take 2", + subsys => "tty", + devpath => "class/tty/ttyUSB0", + exp_name => "visor/0" , + conf => <<EOF KERNEL="*USB1", NAME="bad" KERNEL="*USB0", NAME="visor/%n" EOF }, { - desc => "catch device by ?", - subsys => "tty", - devpath => "class/tty/ttyUSB0", - expected => "visor/0" , - conf => <<EOF + desc => "catch device by ?", + subsys => "tty", + devpath => "class/tty/ttyUSB0", + exp_name => "visor/0" , + conf => <<EOF KERNEL="ttyUSB??*", NAME="visor/%n-1" KERNEL="ttyUSB??", NAME="visor/%n-2" KERNEL="ttyUSB?", NAME="visor/%n" EOF }, { - desc => "catch device by character class", - subsys => "tty", - devpath => "class/tty/ttyUSB0", - expected => "visor/0" , - conf => <<EOF + desc => "catch device by character class", + subsys => "tty", + devpath => "class/tty/ttyUSB0", + exp_name => "visor/0" , + conf => <<EOF KERNEL="ttyUSB[A-Z]*", NAME="visor/%n-1" KERNEL="ttyUSB?[0-9]", NAME="visor/%n-2" KERNEL="ttyUSB[0-9]*", NAME="visor/%n" EOF }, { - desc => "replace kernel name", - subsys => "tty", - devpath => "class/tty/ttyUSB0", - expected => "visor" , - conf => <<EOF + desc => "replace kernel name", + subsys => "tty", + devpath => "class/tty/ttyUSB0", + exp_name => "visor" , + conf => <<EOF KERNEL="ttyUSB0", NAME="visor" EOF }, { - desc => "Handle comment lines in config file (and replace kernel name)", - subsys => "tty", - devpath => "class/tty/ttyUSB0", - expected => "visor" , - conf => <<EOF + desc => "Handle comment lines in config file (and replace kernel name)", + subsys => "tty", + devpath => "class/tty/ttyUSB0", + exp_name => "visor" , + conf => <<EOF # this is a comment KERNEL="ttyUSB0", NAME="visor" EOF }, { - desc => "Handle comment lines in config file with whitespace (and replace kernel name)", - subsys => "tty", - devpath => "class/tty/ttyUSB0", - expected => "visor" , - conf => <<EOF + desc => "Handle comment lines in config file with whitespace (and replace kernel name)", + subsys => "tty", + devpath => "class/tty/ttyUSB0", + exp_name => "visor" , + conf => <<EOF # this is a comment with whitespace before the comment KERNEL="ttyUSB0", NAME="visor" EOF }, { - desc => "Handle empty lines in config file (and replace kernel name)", - subsys => "tty", - devpath => "class/tty/ttyUSB0", - expected => "visor" , - conf => <<EOF + desc => "Handle empty lines in config file (and replace kernel name)", + subsys => "tty", + devpath => "class/tty/ttyUSB0", + exp_name => "visor" , + conf => <<EOF KERNEL="ttyUSB0", NAME="visor" EOF }, { - desc => "subdirectory handling", - subsys => "tty", - devpath => "class/tty/ttyUSB0", - expected => "sub/direct/ory/visor" , - conf => <<EOF + desc => "subdirectory handling", + subsys => "tty", + devpath => "class/tty/ttyUSB0", + exp_name => "sub/direct/ory/visor" , + conf => <<EOF KERNEL="ttyUSB0", NAME="sub/direct/ory/visor" EOF }, { - desc => "place on bus of scsi partition", - subsys => "block", - devpath => "block/sda/sda3", - expected => "first_disk3" , - conf => <<EOF + desc => "place on bus of scsi partition", + subsys => "block", + devpath => "block/sda/sda3", + exp_name => "first_disk3" , + conf => <<EOF BUS="scsi", PLACE="0:0:0:0", NAME="first_disk%n" EOF }, { - desc => "test NAME substitution chars", - subsys => "block", - devpath => "block/sda/sda3", - expected => "Major:8:minor:3:kernelnumber:3:bus:0:0:0:0" , - conf => <<EOF + desc => "test NAME substitution chars", + subsys => "block", + 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" EOF }, { - desc => "test NAME substitution chars (with length limit)", - subsys => "block", - devpath => "block/sda/sda3", - expected => "M8-m3-n3-b0:0-sIBM" , - conf => <<EOF + desc => "test NAME substitution chars (with length limit)", + subsys => "block", + 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}" EOF }, { - desc => "old style SYSFS_ attribute", - subsys => "block", - devpath => "block/sda", - expected => "good" , - conf => <<EOF + desc => "old style SYSFS_ attribute", + subsys => "block", + devpath => "block/sda", + exp_name => "good" , + conf => <<EOF BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="good" EOF }, { - desc => "sustitution of sysfs value (%s{file})", - subsys => "block", - devpath => "block/sda", - expected => "disk-IBM-ESXS-sda" , - conf => <<EOF + desc => "sustitution of sysfs value (%s{file})", + subsys => "block", + devpath => "block/sda", + exp_name => "disk-IBM-ESXS-sda" , + conf => <<EOF BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="disk-%s{vendor}-%k" KERNEL="ttyUSB0", NAME="visor" EOF }, { - desc => "program result substitution", - subsys => "block", - devpath => "block/sda/sda3", - expected => "special-device-3" , - conf => <<EOF + desc => "program result substitution", + subsys => "block", + 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" BUS="scsi", PROGRAM="/bin/echo -n special-device", RESULT="special--*", NAME="%c-2-%n" BUS="scsi", PROGRAM="/bin/echo -n special-device", RESULT="special-device-", NAME="%c-3-%n"
@@ -235,225 +235,225 @@ EOF }, { - desc => "program result substitution", - subsys => "block", - devpath => "block/sda/sda3", - expected => "test-0:0:0:0" , - conf => <<EOF + desc => "program result substitution", + subsys => "block", + 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" EOF }, { - desc => "program with escaped format char (tricky: callout returns format char!)", - subsys => "block", - devpath => "block/sda/sda3", - expected => "escape-3" , - conf => <<EOF + desc => "program with escaped format char (tricky: callout returns format char!)", + subsys => "block", + devpath => "block/sda/sda3", + exp_name => "escape-3" , + conf => <<EOF BUS="scsi", PROGRAM="/bin/echo -n escape-%%n", KERNEL="sda3", NAME="%c" EOF }, { - desc => "program with lots of arguments", - subsys => "block", - devpath => "block/sda/sda3", - expected => "foo9" , - conf => <<EOF + desc => "program with lots of arguments", + subsys => "block", + 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}" EOF }, { - desc => "program with subshell", - subsys => "block", - devpath => "block/sda/sda3", - expected => "bar9" , - conf => <<EOF + desc => "program with subshell", + subsys => "block", + 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}" EOF }, { - desc => "program arguments combined with apostrophes", - subsys => "block", - devpath => "block/sda/sda3", - expected => "foo7" , - conf => <<EOF + desc => "program arguments combined with apostrophes", + subsys => "block", + 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}" EOF }, { - desc => "characters before the %c{N} substitution", - subsys => "block", - devpath => "block/sda/sda3", - expected => "my-foo9" , - conf => <<EOF + desc => "characters before the %c{N} substitution", + subsys => "block", + 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}" EOF }, { - desc => "substitute the second to last argument", - subsys => "block", - devpath => "block/sda/sda3", - expected => "my-foo8" , - conf => <<EOF + desc => "substitute the second to last argument", + subsys => "block", + 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}" EOF }, { - desc => "program result substitution (numbered part of)", - subsys => "block", - devpath => "block/sda/sda3", - expected => "link1" , - conf => <<EOF + desc => "program result substitution (numbered part of)", + subsys => "block", + 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}" EOF }, { - desc => "program result substitution (numbered part of+)", - subsys => "block", - devpath => "block/sda/sda3", - expected => "link3" , - conf => <<EOF + desc => "program result substitution (numbered part of+)", + subsys => "block", + 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+}" EOF }, { - desc => "invalid program for device with no bus", - subsys => "tty", - devpath => "class/tty/console", - expected => "TTY" , - conf => <<EOF + desc => "invalid program for device with no bus", + subsys => "tty", + devpath => "class/tty/console", + exp_name => "TTY" , + conf => <<EOF BUS="scsi", PROGRAM="/bin/echo -n foo", RESULT="foo", NAME="foo" KERNEL="console", NAME="TTY" EOF }, { - desc => "valid program for device with no bus", - subsys => "tty", - devpath => "class/tty/console", - expected => "foo" , - conf => <<EOF + desc => "valid program for device with no bus", + subsys => "tty", + devpath => "class/tty/console", + exp_name => "foo" , + conf => <<EOF PROGRAM="/bin/echo -n foo", RESULT="foo", NAME="foo" KERNEL="console", NAME="TTY" EOF }, { - desc => "invalid label for device with no bus", - subsys => "tty", - devpath => "class/tty/console", - expected => "TTY" , - conf => <<EOF + desc => "invalid label for device with no bus", + subsys => "tty", + devpath => "class/tty/console", + exp_name => "TTY" , + conf => <<EOF BUS="foo", SYSFS{dev}="5:1", NAME="foo" KERNEL="console", NAME="TTY" EOF }, { - desc => "valid label for device with no bus", - subsys => "tty", - devpath => "class/tty/console", - expected => "foo" , - conf => <<EOF + desc => "valid label for device with no bus", + subsys => "tty", + devpath => "class/tty/console", + exp_name => "foo" , + conf => <<EOF SYSFS{dev}="5:1", NAME="foo" KERNEL="console", NAME="TTY" EOF }, { - desc => "program and bus type match", - subsys => "block", - devpath => "block/sda", - expected => "scsi-0:0:0:0" , - conf => <<EOF + desc => "program and bus type match", + subsys => "block", + devpath => "block/sda", + exp_name => "scsi-0:0:0:0" , + conf => <<EOF BUS="usb", PROGRAM="/bin/echo -n usb-%b", NAME="%c" BUS="scsi", PROGRAM="/bin/echo -n scsi-%b", NAME="%c" BUS="foo", PROGRAM="/bin/echo -n foo-%b", NAME="%c" EOF }, { - desc => "symlink creation (same directory)", - subsys => "tty", - devpath => "class/tty/ttyUSB0", - expected => "visor0" , - conf => <<EOF + desc => "symlink creation (same directory)", + subsys => "tty", + devpath => "class/tty/ttyUSB0", + exp_name => "visor0" , + conf => <<EOF KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="visor%n" EOF }, { - desc => "symlink creation (relative link back)", - subsys => "block", - devpath => "block/sda/sda2", - expected => "1/2/a/b/symlink" , - conf => <<EOF + desc => "symlink creation (relative link back)", + subsys => "block", + 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" EOF }, { - desc => "symlink creation (relative link forward)", - subsys => "block", - devpath => "block/sda/sda2", - expected => "1/2/symlink" , - conf => <<EOF + desc => "symlink creation (relative link forward)", + subsys => "block", + 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" EOF }, { - desc => "symlink creation (relative link back and forward)", - subsys => "block", - devpath => "block/sda/sda2", - expected => "1/2/c/d/symlink" , - conf => <<EOF + desc => "symlink creation (relative link back and forward)", + subsys => "block", + 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" EOF }, { - desc => "multiple symlinks", - subsys => "tty", - devpath => "class/tty/ttyUSB0", - expected => "second-0" , - conf => <<EOF + desc => "multiple symlinks", + subsys => "tty", + devpath => "class/tty/ttyUSB0", + exp_name => "second-0" , + conf => <<EOF KERNEL="ttyUSB0", NAME="visor", SYMLINK="first-%n second-%n third-%n" EOF }, { - desc => "create all possible partitions", - subsys => "block", - devpath => "block/sda", - expected => "boot_disk15" , - conf => <<EOF + desc => "create all possible partitions", + subsys => "block", + devpath => "block/sda", + exp_name => "boot_disk15" , + conf => <<EOF BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME{all_partitions}="boot_disk" EOF }, { - desc => "sysfs parent hierarchy", - subsys => "tty", - devpath => "class/tty/ttyUSB0", - expected => "visor" , - conf => <<EOF + desc => "sysfs parent hierarchy", + subsys => "tty", + devpath => "class/tty/ttyUSB0", + exp_name => "visor" , + conf => <<EOF SYSFS{idProduct}="2008", NAME="visor" EOF }, { - desc => "name test with ! in the name", - subsys => "block", - devpath => "block/rd!c0d0", - expected => "rd/c0d0" , - conf => <<EOF + desc => "name test with ! in the name", + subsys => "block", + devpath => "block/rd!c0d0", + exp_name => "rd/c0d0" , + conf => <<EOF BUS="scsi", NAME="%k" KERNEL="ttyUSB0", NAME="visor" EOF }, { - desc => "name test with ! in the name, but no matching rule", - subsys => "block", - devpath => "block/rd!c0d0", - expected => "rd/c0d0" , - conf => <<EOF + desc => "name test with ! in the name, but no matching rule", + subsys => "block", + devpath => "block/rd!c0d0", + exp_name => "rd/c0d0" , + conf => <<EOF KERNEL="ttyUSB0", NAME="visor" EOF }, { - desc => "ID rule", - subsys => "block", - devpath => "block/sda", - expected => "scsi-0:0:0:0", - conf => <<EOF + desc => "ID rule", + subsys => "block", + devpath => "block/sda", + exp_name => "scsi-0:0:0:0", + conf => <<EOF BUS="usb", ID="0:0:0:0", NAME="not-scsi" BUS="scsi", ID="0:0:0:1", NAME="no-match" BUS="scsi", ID=":0", NAME="short-id"
@@ -462,11 +462,11 @@ EOF }, { - desc => "ID wildcard all", - subsys => "block", - devpath => "block/sda", - expected => "scsi-0:0:0:0", - conf => <<EOF + desc => "ID wildcard all", + subsys => "block", + devpath => "block/sda", + exp_name => "scsi-0:0:0:0", + conf => <<EOF BUS="scsi", ID="*:1", NAME="no-match" BUS="scsi", ID="*:0:1", NAME="no-match" BUS="scsi", ID="*:0:0:1", NAME="no-match"
@@ -475,62 +475,73 @@ EOF }, { - desc => "ID wildcard partial", - subsys => "block", - devpath => "block/sda", - expected => "scsi-0:0:0:0", - conf => <<EOF + desc => "ID wildcard partial", + subsys => "block", + devpath => "block/sda", + exp_name => "scsi-0:0:0:0", + conf => <<EOF BUS="scsi", ID="*:0", NAME="scsi-0:0:0:0" BUS="scsi", ID="0:0:0:0", NAME="bad" EOF }, { - desc => "ID wildcard partial 2", - subsys => "block", - devpath => "block/sda", - expected => "scsi-0:0:0:0", - conf => <<EOF + desc => "ID wildcard partial 2", + subsys => "block", + devpath => "block/sda", + exp_name => "scsi-0:0:0:0", + conf => <<EOF BUS="scsi", ID="*:0:0:0", NAME="scsi-0:0:0:0" BUS="scsi", ID="0:0:0:0", NAME="bad" EOF }, { - desc => "ignore SYSFS attribute whitespace", - subsys => "block", - devpath => "block/sda", - expected => "ignored", - conf => <<EOF + desc => "ignore SYSFS attribute whitespace", + subsys => "block", + devpath => "block/sda", + exp_name => "ignored", + conf => <<EOF BUS="scsi", SYSFS{whitespace_test}="WHITE SPACE", NAME="ignored" EOF }, { - desc => "do not ignore SYSFS attribute whitespace", - subsys => "block", - devpath => "block/sda", - expected => "matched-with-space", - conf => <<EOF + desc => "do not ignore SYSFS attribute whitespace", + subsys => "block", + devpath => "block/sda", + exp_name => "matched-with-space", + conf => <<EOF BUS="scsi", SYSFS{whitespace_test}="WHITE SPACE ", NAME="wrong-to-ignore" BUS="scsi", SYSFS{whitespace_test}="WHITE SPACE ", NAME="matched-with-space" EOF }, { - desc => "SYMLINK only rule", - subsys => "block", - devpath => "block/sda", - expected => "symlink-only2", - conf => <<EOF + desc => "SYMLINK only rule", + subsys => "block", + devpath => "block/sda", + exp_name => "symlink-only2", + conf => <<EOF BUS="scsi", KERNEL="sda", SYMLINK="symlink-only1" BUS="scsi", KERNEL="sda", SYMLINK="symlink-only2" BUS="scsi", KERNEL="sda", NAME="link", SYMLINK="symlink0" EOF }, { - desc => "permissions test", - subsys => "block", - devpath => "block/sda", - expected => "node", - perms => "5000::0444", - conf => <<EOF + desc => "permissions test", + subsys => "block", + devpath => "block/sda", + exp_name => "node", + perms => "5000::0444", + conf => <<EOF +BUS="scsi", KERNEL="sda", NAME="node", OWNER="5000", MODE="0444" +EOF + }, + { + desc => "major/minor number test", + subsys => "block", + devpath => "block/sda", + exp_name => "node", + perms => "5000::0444", + exp_majorminor => "8:0", + conf => <<EOF BUS="scsi", KERNEL="sda", NAME="node", OWNER="5000", MODE="0444" EOF },
@@ -560,17 +571,18 @@ sub run_test { my ($config, $number) = @_; - + print "TEST $number: $config->{desc}\n"; - print "device \'$config->{devpath}\' expecting node \'$config->{expected}\'\n"; + print "device \'$config->{devpath}\' expecting node \'$config->{exp_name}\'\n"; udev("add", $config->{subsys}, $config->{devpath}, \$config->{conf}); - if (-e "$PWD/$udev_root$config->{expected}") { + if (-e "$PWD/$udev_root$config->{exp_name}") { + + my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size, + $atime, $mtime, $ctime, $blksize, $blocks) = stat("$PWD/$udev_root$config->{exp_name}"); + if (defined($config->{perms})) { my $wrong = 0; - my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size, - $atime, $mtime, $ctime, $blksize, $blocks) = stat("$PWD/$udev_root$config->{expected}"); - $config->{perms} =~ m/^(.*):(.*):(.*)$/; if ($1 ne "") { if ($uid != $1) { $wrong = 1; };
@@ -586,6 +598,25 @@ printf "created permissions are : %i:%i:%#o\n", $uid, $gid, $mode & 07777; } } + + if (defined($config->{exp_majorminor})) { + my $major = ($rdev >> 8) & 0xfff; + my $minor = ($rdev & 0xff) | (($rdev >> 12) & 0xfff00); + + my $wrong = 0; + $config->{exp_majorminor} =~ m/^(.*):(.*)$/; + if ($1 ne "") { + if ($major != $1) { $wrong = 1; }; + } + if ($2 ne "") { + if ($minor != $2) { $wrong = 1; }; + } + if ($wrong == 1) { + printf "expected major:minor is: %i:%i\n", $1, $2; + printf "created major:minor is : %i:%i\n", $major, $minor; + } + } + print "add: ok "; } else { print "add: error\n";
@@ -595,8 +626,8 @@ } udev("remove", $config->{subsys}, $config->{devpath}, \$config->{conf}); - if ((-e "$PWD/$udev_root$config->{expected}") || - (-l "$PWD/$udev_root$config->{expected}")) { + if ((-e "$PWD/$udev_root$config->{exp_name}") || + (-l "$PWD/$udev_root$config->{exp_name}")) { print "remove: error\n\n"; system("tree $udev_root"); $error++;
Quoted 11 lines · Kay Sievers
===
namedev_parse.c1.30 vs edited ==> ---1.30/namedev_parse.cWed Mar 3 22:43:42 2004
+++edited/namedev_parse.cSun Mar 7 01:33:40 2004namedev_parse.c +1
-0@@ -43,6 +43,7 @@LIST_HEAD (file_list); +static int add_config_dev (struct config_device *new_dev) {struct config_device *tmp_dev;
namedev_parse.c line 69
Quoted 9 lines
namedev_parse.c +3
-1@@ -61,9 +62,11 @@dbg_parse ("name='%s', symlink='%s', bus='%s', place='%s', id='%s', " "sysfs_file[0]='%s', sysfs_value[0]='%s', " "kernel='%s', program='%s', result='%s'" , +"owner='%s', group='%s', mode=%#o" , dev->name, dev->symlink, dev->bus, dev->place, dev->id, dev->sysfs_pair[0 ].file, dev->sysfs_pair[0 ].value, - dev->kernel, dev->program, dev->result); + dev->kernel, dev->program, dev->result,; + dev->owner, dev->group, dev->mode);
gcc is very unhappy about that extra ';' :)
Signature · 14 lines
USB is for mice, FireWire is for men! sUse lINUX ag, nÜRNBERG ------------------------------------------------------- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id70&alloc_id638&op�k _______________________________________________ Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net [email protected] https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
Quoted 5 lines · Olaf Hering
namedev_parse.c line 69
Quoted 2 lines · Kay Sievers
namedev_parse.c +2
-0+ dev->kernel, dev->program, dev->result,; + dev->owner, dev->group, dev->mode);gcc is very unhappy about that extra ';' :)
Oh yes, thanks.
How did you find this? I don't get any warning.
Kay
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id70&alloc_id638&op=click
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
Quoted 9 lines · Kay Sievers
Quoted 5 lines · Olaf Hering
namedev_parse.c line 69
Quoted 2 lines · Kay Sievers
namedev_parse.c +2
-0+ dev->kernel, dev->program, dev->result,; + dev->owner, dev->group, dev->mode);gcc is very unhappy about that extra ';' :)
Oh yes, thanks.
How did you find this? I don't get any warning.
namedev_parse.c: In function `dump_config_dev':
namedev_parse.c:62: error: parse error before ';' token namedev_parse.c:62: warning: left-hand operand of comma expression has no effect namedev_parse.c:62: warning: left-hand operand of comma expression has no effect namedev_parse.c:62: error: parse error before ')' token
Signature · 14 lines
USB is for mice, FireWire is for men! sUse lINUX ag, nÜRNBERG ------------------------------------------------------- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id70&alloc_id638&op�k _______________________________________________ Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net [email protected] https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
Quoted 9 lines · Olaf Hering
Quoted 7 lines · Kay Sievers
Quoted 5 lines · Olaf Hering
namedev_parse.c line 69
Quoted 2 lines · Kay Sievers
namedev_parse.c +2
-0+ dev->kernel, dev->program, dev->result,; + dev->owner, dev->group, dev->mode);gcc is very unhappy about that extra ';' :)
Quoted 8 lines
Quoted 2 lines
Oh yes, thanks.
How did you find this? I don't get any warning.
namedev_parse.c: In function `dump_config_dev':
namedev_parse.c:62: error: parse error before ';' token namedev_parse.c:62: warning: left-hand operand of comma expression has no effect namedev_parse.c:62: warning: left-hand operand of comma expression has no effect namedev_parse.c:62: error: parse error before ')' token
Hmm, that's what I would expect.
But I don't get anything with gcc version 3.3.3.
Strange.
thanks,
Kay
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id70&alloc_id638&op=click
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
Quoted 8 lines · Olaf Hering
Quoted 6 lines · Kay Sievers
===
namedev_parse.c1.30 vs edited ==> > ---1.30/namedev_parse.cWed Mar 3 22:43:42 2004
+++edited/namedev_parse.cSun Mar 7 01:33:40 2004namedev_parse.c +0
-0@@ -43,6 +43,7 @@LIST_HEAD (file_list);
Quoted 16 lines
Quoted 5 lines
namedev_parse.c +1
-0+static int add_config_dev (struct config_device *new_dev) {struct config_device *tmp_dev;namedev_parse.c line 69
Quoted 9 lines
namedev_parse.c +3
-1@@ -61,9 +62,11 @@dbg_parse ("name='%s', symlink='%s', bus='%s', place='%s', id='%s', " "sysfs_file[0]='%s', sysfs_value[0]='%s', " "kernel='%s', program='%s', result='%s'" , +"owner='%s', group='%s', mode=%#o" , dev->name, dev->symlink, dev->bus, dev->place, dev->id, dev->sysfs_pair[0 ].file, dev->sysfs_pair[0 ].value, - dev->kernel, dev->program, dev->result); + dev->kernel, dev->program, dev->result,; + dev->owner, dev->group, dev->mode);gcc is very unhappy about that extra ';' :)
thanks, I've now fixed this in the tree.
greg k-h
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id70&alloc_id638&op=click
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
Greg KH
AppliedQuoted 5 lines · Kay Sievers
Quoted 4 lines · Greg KH
Quoted 3 lines · Kay Sievers
Quoted 2 lines
Any chance on being able to add a test for this kind of stuff to the udev-test.pl script?
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Sure, not brilliant but seems to work :)
Only numeric id's are supported so far.Nice, that's a good start. Now we need to check the major:minor values too somehow...
I better do it immediately, before you put it in the empty TODO :)
heh.
Quoted 2 lines
Patch is a bit big, cause spaces are changed to tabs to get space for the longer names.
Applied, thanks for doing this. I added the ability to report a "ok" test for permissions and major/minor and added a big minor test to the scripts.
thanks,
greg k-h
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id70&alloc_id638&op=click
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel