1
0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00
Commit Graph

18647 Commits

Author SHA1 Message Date
kay.sievers@vrfy.org
c124eafa23 [PATCH] - format char for CALLOUT output
here is a patch for inserting the callout output into NAME=.
ID= supports the usual wildcard to compare with the output.

I've moved all wildcard matching to a function cause this was the third occurrence.
Also attached is the last whitespace cleanup and debug text corrections.
The callout patch depends on the whitespace patch.


CALLOUT, BUS="usb", PROGRAM="/bin/echo -n return", ID="ret*", NAME="webcam-%c-"

results in:

Nov 21 17:33:51 pim udev[20399]: get_major_minor: found major = 81, minor = 0
Nov 21 17:33:51 pim udev[20399]: exec_callout: callout to '/bin/echo -n return'
Nov 21 17:33:51 pim udev[20399]: exec_callout: callout returned 'return'
Nov 21 17:33:51 pim udev[20399]: get_attr: substitute callout output 'return'
Nov 21 17:33:51 pim udev[20399]: udev_add_device: name = webcam-return-
Nov 21 17:33:51 pim udev[20399]: create_node: mknod(/udev/webcam-return-, 020660, 81, 0)
2005-04-26 21:13:02 -07:00
kay.sievers@vrfy.org
53dc383ee9 [PATCH] more namedev whitespace cleanups
attached is the last whitespace cleanup and debug text corrections.
2005-04-26 21:13:02 -07:00
greg@kroah.com
6a670d61bc [PATCH] only build klibc_fixups.c if we are actually using klibc. 2005-04-26 21:13:02 -07:00
greg@kroah.com
10950dfe84 [PATCH] add support for string group and string user names in udev.permissions.
This only works if you are using glibc.

Patch based on patch from Marco d'Itri <md@Linux.IT>
2005-04-26 21:13:02 -07:00
greg@kroah.com
2023350eec [PATCH] add getgrnam and getpwnam to klibc_fixups files.
Hopefully the klibc_fixups code will not be needed eventually.
2005-04-26 21:13:02 -07:00
md@Linux.IT
04a81cac0a [PATCH] fix segfault in parsing bad udev.permissions file 2005-04-26 21:13:02 -07:00
greg@kroah.com
388e2a6a47 [PATCH] remove Makefile.klibc 2005-04-26 21:06:26 -07:00
olh@suse.de
ed83913730 [PATCH] static klibc udev does not link against crt0.o
On Wed, Nov 19, Greg KH wrote:

> > I did 'make KLIBC=true' in the current bk tree.
>
> try 'make -f Makefile.klibc' in the current tree.  For some reason I
> couldn't figure out how to have Makefile work for both KLIBC=true and
> KLIBC=false.  But I didn't try too hard :)

I dont understand that.

please do rm -f Makefile.klibc; apply this patch and tell me what fails.
works for me.
2005-04-26 21:06:26 -07:00
greg@kroah.com
a367f04ee0 [PATCH] add udev-test perl script from Kay Sievers <kay.sievers@vrfy.org> which blows away my puny shell scripts. 2005-04-26 21:06:25 -07:00
greg@kroah.com
75d0730c84 [PATCH] added debian's version of udev.permissions.
Hm, should probably move all of the config file stuff to a new directory soon...
2005-04-26 21:06:25 -07:00
kay.sievers@vrfy.org
bc43451131 [PATCH] support arguments in callout exec
here is argument support for CALLOUT exec:

CALLOUT, PROGRAM="/bin/echo -n xxx", BUS="usb", ID="xxx", NAME="webcam%n"

results in:

Nov 20 02:35:20 pim udev[30422]: get_major_minor: found major = 81, minor = 0
Nov 20 02:35:20 pim udev[30422]: exec_callout: callout to /bin/echo -n xxx
Nov 20 02:35:20 pim udev[30422]: exec_callout: callout returned 'xxx'
Nov 20 02:35:20 pim udev[30422]: get_attr: kernel number appended: 0

The feature is really nice, but the maximum argument count is hard coded to 8.
2005-04-26 21:06:25 -07:00
kay.sievers@vrfy.org
cb08e0f253 [PATCH] namedev.c - change order of fields in CALLOUT
I want to bring the CALLOUT field ordering in line with the other
methods, cause the current parsing relies on the ordering it's good
to have it like the others. The BUS= is now the first expected field.

Also made the last two remaining field names to uppercase and the man page
callout example is updated.
2005-04-26 21:06:25 -07:00
kay.sievers@vrfy.org
8f43a65e4f [PATCH] namedev.c whitespace + debug text cleanup
here is mainly a whitespace cleanup for namedev.c. I changed the
dbg_parse() output a bit for better readability:


current:

Nov 19 19:00:59 pim udev[25582]: do_number: NUMBER path='/sys/devices/pci0000:00/0000:00:1d.1/usb2/2-1/2-1.1'
Nov 19 19:00:59 pim udev[25582]: do_number: NUMBER temp='/2-1.1' id='00:07.1'
Nov 19 19:00:59 pim udev[25582]: do_number: NUMBER temp='/2-1' id='00:07.1'
Nov 19 19:00:59 pim udev[25582]: do_number: NUMBER path='/sys/devices/pci0000:00/0000:00:1d.1/usb2/2-1/2-1.1'
Nov 19 19:00:59 pim udev[25582]: do_number: NUMBER temp='/2-1.1' id='00:0b.0'
Nov 19 19:00:59 pim udev[25582]: do_number: NUMBER temp='/2-1' id='00:0b.0'
Nov 19 19:00:59 pim udev[25582]: do_number: NUMBER path='/sys/devices/pci0000:00/0000:00:1d.1/usb2/2-1/2-1.1'
Nov 19 19:00:59 pim udev[25582]: do_number: NUMBER temp='/2-1.1' id='2-1.1'
Nov 19 19:00:59 pim udev[25582]: do_number: device id '2-1.1' becomes 'webcam%n' - owner='', group ='', mode=0


becomes:

Nov 19 19:23:40 pim udev[26091]: do_number: search '00:07.1' in '/2-1.1', path='/sys/devices/pci0000:00/0000:00:1d.1/usb2/2-1/2-1.1'
Nov 19 19:23:40 pim udev[26091]: do_number: search '00:07.1' in '/2-1', path='/sys/devices/pci0000:00/0000:00:1d.1/usb2/2-1'
Nov 19 19:23:40 pim udev[26091]: do_number: search '00:0b.0' in '/2-1.1', path='/sys/devices/pci0000:00/0000:00:1d.1/usb2/2-1/2-1.1'
Nov 19 19:23:40 pim udev[26091]: do_number: search '00:0b.0' in '/2-1', path='/sys/devices/pci0000:00/0000:00:1d.1/usb2/2-1'
Nov 19 19:23:40 pim udev[26091]: do_number: search '2-1.1' in '/2-1.1', path='/sys/devices/pci0000:00/0000:00:1d.1/usb2/2-1/2-1.1'
Nov 19 19:23:40 pim udev[26091]: do_number: found id '2-1.1', 'video0' becomes 'webcam%n' - owner='', group ='', mode=0
2005-04-26 21:06:25 -07:00
kay.sievers@vrfy.org
d0a4a110b7 [PATCH] man page with udev.permissions wildcard
here is the permissions wildcard text for the man page.
2005-04-26 21:06:25 -07:00
greg@kroah.com
95d3e90130 [PATCH] change to 006_bk version 2005-04-26 21:06:25 -07:00
greg@kroah.com
378fe59875 [PATCH] v006 2005-04-26 21:06:25 -07:00
greg@kroah.com
b981d07a19 [PATCH] v006 changelog 2005-04-26 21:06:25 -07:00
greg@kroah.com
4d595658c7 [PATCH] add another line to udev.permissions in the proper format. 2005-04-26 21:06:25 -07:00
greg@kroah.com
d6d413dab7 [PATCH] tweak replace_test 2005-04-26 21:06:25 -07:00
greg@kroah.com
5bd1061cd6 [PATCH] fix permissions to work properly now.
Forgot about umask in mknod...
2005-04-26 21:06:25 -07:00
greg@kroah.com
3258c82887 [PATCH] add real udev.permissions file to test directory. 2005-04-26 21:06:25 -07:00
greg@kroah.com
a1b8786ae6 [PATCH] fix namedev.c to build with older version of gcc. 2005-04-26 21:06:25 -07:00
kay.sievers@vrfy.org
09e52d5126 [PATCH] apply permissions.conf support for wildcard and default name
Permissions given in udev.permissions are not applied if no METHOD from
udev.config is found. I've added do_kernelname() to scan for known
permissions if we only use the default method.

Simple support for wildcards is also added:

#name:user:group:mode
hdb*:2702:2702:0660

results in:

drwxr-xr-x    2 root     root          240 Nov 19 03:45 .
drwxr-xr-x   23 root     root          528 Nov 17 03:36 ..
brw-r--r--    1 root     root       3,   0 Nov 19 03:45 hda
brw-r--r--    1 root     root       3,   1 Nov 19 03:45 hda1
brw-r--r--    1 root     root       3,   2 Nov 19 03:45 hda2
brw-r--r--    1 root     root       3,   4 Nov 19 03:45 hda4
brw-r-----    1 kay      kay        3,  64 Nov 19 03:45 hdb
brw-r-----    1 kay      kay        3,  65 Nov 19 03:45 hdb1
brw-r--r--    1 root     root      22,   0 Nov 19 03:45 hdc
crw-r--r--    1 root     root      81,   0 Nov 19 03:34 webcam0
2005-04-26 21:06:25 -07:00
kay.sievers@vrfy.org
4b710f033e [PATCH] man page with included placeholder list
mention the printf-like support for string substitution in the NAME field
2005-04-26 21:06:25 -07:00
greg@kroah.com
db7a38df63 [PATCH] add dumb test for all of the different modifiers. 2005-04-26 21:06:25 -07:00
greg@kroah.com
cd55637f42 [PATCH] update the TODO list with more items that people can easily do. 2005-04-26 21:06:25 -07:00
chris_friesen@sympatico.ca
8e5d592525 [PATCH] faster test scripts
I've attached a patch against 005 for both the block and tty scripts.  I
didn't bother running udev backgrounded, since as you say, the new code
runs a lot faster.
2005-04-26 21:06:25 -07:00
greg@kroah.com
17f73597fe [PATCH] move the test.block and test.tty scripts to the test/ directory 2005-04-26 21:06:25 -07:00
greg@kroah.com
1ac5204774 [PATCH] add remove actions to the test scripts 2005-04-26 21:06:24 -07:00
greg@kroah.com
a43180955a [PATCH] turn DEBUG_PARSER off by default. 2005-04-26 21:06:24 -07:00
greg@kroah.com
c34c7c5018 [PATCH] add some documentation for the %b modifier to the default config file. 2005-04-26 21:06:24 -07:00
greg@kroah.com
baa936855e [PATCH] fix make install rule for when the udev symlink is already there. 2005-04-26 21:06:24 -07:00
arnd@arndb.de
70033702cd [PATCH] more robust config file parsing in namedev.c
After getting a number of different crashes for udev reading broken
udev.config files, I decided to try to make the parser a little
more robust.

The behaviour is changed to stop reading the configuration file
and logging the broken entry instead of silently ignoring it (is
that good? It's easy to just print and continue).
All strcpy()'s to a fixed length string are now implicitly limited
to the bounds of the target string.

I kept the -ENODEV return code for now, not sure if there should be
different ones.
2005-04-26 21:06:24 -07:00
arnd@arndb.de
ae2859df40 [PATCH] add bus id modifier
On Tuesday 18 November 2003 02:14, Greg KH wrote:
> On Mon, Nov 17, 2003 at 06:33:32PM +0100, Arnd Bergmann wrote:
> > That would at least be part of the solution I'm looking for. How about
> > extra format characters for bus_id and for the result of a callout
> > program?
>
> Sure, I can see the use for that.  Want to send a patch?  :)

> Take a look at the current bk tree (which has moved to
> bk://linuxusb.bkbits.net/udev/ )  I've made finding that device a lot
> easier now, and it works for all rule types.

Great, just what I was missing. I didn't see the any link to the bk
repository. Here's the patch for the bus_id. I'll need to think about
the handling of callout results a bit more.
2005-04-26 21:06:24 -07:00
greg@kroah.com
54e3a5d3ae [PATCH] change release target in makefile. 2005-04-26 21:06:24 -07:00
greg@kroah.com
5e6e29fd35 [PATCH] change debug level on printf values for now. 2005-04-26 21:06:24 -07:00
greg@kroah.com
fb2e1c4d6a [PATCH] updated demo config file. 2005-04-26 21:06:24 -07:00
greg@kroah.com
85f3a7c3e0 [PATCH] add some documentation of the modifiers to the default config file. 2005-04-26 21:06:24 -07:00
greg@kroah.com
e366a45961 [PATCH] add demo config file. 2005-04-26 21:06:24 -07:00
greg@kroah.com
f54b927e8b [PATCH] add printf option to label test to verify it works. 2005-04-26 21:06:24 -07:00
greg@kroah.com
7408a7fbb5 [PATCH] fix up printf-like functionality due to previous changes. 2005-04-26 21:06:24 -07:00
kay.sievers@vrfy.org
98b88dbf70 [PATCH] implement printf-like placeholder support for NAME
> Problem is, if you use the LABEL rule to match a device, like a SCSI
> vendor, then all of the partitions, as well as the main block device,
> will end up with the same name.  That's why I added the "add the number"
> hack to the LABEL rule.
>
> So yes, your patch is correct in that we shouldn't always be adding the
> number to any match for LABEL (like for char devices), but if we do
> that, then we break partitions.  Your '%' patch fixes this, but I'd just
> like to extend it a bit.  Let me see what I can come up with...

Oh, I see. Do you mean something like this:

LABEL, BUS="usb", model="Creative Labs WebCam 3", NAME="webcam%n-%M:%m-test"

results in: "webcam0-81:0-test"

Nov 15 16:51:53 pim udev[16193]: get_class_dev: looking at /sys/class/video4linux/video0
Nov 15 16:51:53 pim udev[16193]: get_class_dev: class_dev->name = video0
Nov 15 16:51:53 pim udev[16193]: get_major_minor: dev = 81:0
Nov 15 16:51:53 pim udev[16193]: get_major_minor: found major = 81, minor = 0
Nov 15 16:51:53 pim udev[16193]: udev_add_device: name = webcam0-81:0-test
Nov 15 16:51:53 pim udev[16193]: create_node: mknod(/udev/webcam0-81:0-test, 020666, 81, 0)



  implement printf-like placeholder support for NAME
  %n-kernel number, %M-major number, %m-minor number
2005-04-26 21:06:24 -07:00
greg@kroah.com
30defadd3f [PATCH] get the major/minor number before we name the device.
Will come in handy later...
2005-04-26 21:06:24 -07:00
greg@kroah.com
c521693b54 [PATCH] add scsi_id "extra" program from Patrick Mansfield <patmans@us.ibm.com> 2005-04-26 21:06:24 -07:00
greg@kroah.com
04a091d47e [PATCH] Add multipath "extra" program from Christophe Varoqui, <christophe.varoqui@free.fr> 2005-04-26 21:06:24 -07:00
greg@kroah.com
20ff86bd71 [PATCH] trailing whitespace cleanups. 2005-04-26 21:06:24 -07:00
greg@kroah.com
ca1cc0fe74 [PATCH] splig LABEL and NUMBER into separate functions.
Now items are processed in priority order, fixing that bug.
2005-04-26 21:06:24 -07:00
greg@kroah.com
a38c862f88 [PATCH] add TOPO regression test. 2005-04-26 21:06:23 -07:00
greg@kroah.com
8c51bbfe5f [PATCH] move TOPOLOGY rule to it's own function. 2005-04-26 21:06:23 -07:00
greg@kroah.com
8a0c11d360 [PATCH] fix bug where NUMBER and TOPOLOGY would not work for partitions. 2005-04-26 21:06:23 -07:00