summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2014-09-17udev: split out parse_argv()Tom Gundersen
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-09-17udev: split out help and modernise a bitTom Gundersen
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-09-15src/shared/set.h: remove unnecessary function declarationAnthony G. Basile
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-09-15hashmap: introduce hash_ops to make struct Hashmap smallerMichal Schmidt
It is redundant to store 'hash' and 'compare' function pointers in struct Hashmap separately. The functions always comprise a pair. Store a single pointer to struct hash_ops instead. systemd keeps hundreds of hashmaps, so this saves a little bit of memory. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-09-13udev: timeout - warn after a third of the timeout before killingTom Gundersen
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-09-13udev: allow removing tags via TAG-="foobar"David Herrmann
This extends the udev parser to support OP_REMOVE (-=) and adds support for TAG-= to remove previously set tags. We don't fail if the tag didn't exist. This is pretty handy if we ship default rules for seat-assignments and users want to exclude specific devices from that. They can easily add rules that drop any automatically added "seat" tags again. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-09-13skip udev: event - keep one rtnl per worker, rather than per eventAnthony G. Basile
This commit follows upstream's 4c83d994566718043e61e568cc214bdc4587f869 We adopt their removal of excessive logging, but we do not switch to one rtnl per worker, rather than per event. This maintains code separation between libsystemd and udev code. The disadvantage is that we do not get the cost savings of having one rtnl per worker rather than per event. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-09-13udev: remove userspace firmware loading supportKay Sievers
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-09-10udev: timeout - increase timeoutTom Gundersen
Some kernel modules still take more than one minute to insmod, we no longer rely on the timeout killing insmod within a given period of time, so just bump this to a much higher value. Its only purpose is to make sure that nothing stays aronud forever. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-09-10udev: fix copy-paste error in log messageTom Gundersen
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-09-10udev: import the full db on MOVE events for devices without dev_tTom Gundersen
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-09-10udev - drop print_kmsgTom Gundersen
The only remaining user was 'starting version XXX', which is now logged using log_info(). Basile: There were also print_kmsg in udev-event.c which I switched to log_info(). Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-09-10libudev: fix symbol version for udev_queue_flush() and udev_queue_get_fd()Michael Biebl
Those symbols were introduced in commit 14cb733684d3c3f50d088a3a370ddf8e8894dfa4 and released in v215. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-09-03src/libudev/Makefile.am: link libudev against selinuxAmadeusz Sławiński
Signed-off-by: Amadeusz Sławiński <amade@asmblr.net> Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-09-02src/shared/label.c: include selinux headersAmadeusz Sławiński
Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
2014-09-01udev: bump event timeout to 60 secondsKay Sievers
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-27shared: make container_of() use unique variable namesDavid Herrmann
If you stack container_of() macros, you will get warnings due to shadowing variables of the parent context. To avoid this, use unique names for variables. Two new helpers are added: UNIQ: This evaluates to a truly unique value never returned by any evaluation of this macro. It's a shortcut for __COUNTER__. UNIQ_T: Takes two arguments and concatenates them. It is a shortcut for CONCATENATE, but meant to defined typed local variables. As you usually want to use variables that you just defined, you need to reference the same unique value at least two times. However, UNIQ returns a new value on each evaluation, therefore, you have to pass the unique values into the macro like this: #define my_macro(a, b) __max_macro(UNIQ, UNIQ, (a), (b)) #define __my_macro(uniqa, uniqb, a, b) ({ typeof(a) UNIQ_T(A, uniqa) = (a); typeof(b) UNIQ_T(B, uniqb) = (b); MY_UNSAFE_MACRO(UNIQ_T(A, uniqa), UNIQ_T(B, uniqb)); }) This way, MY_UNSAFE_MACRO() can safely evaluate it's arguments multiple times as they are local variables. But you can also stack invocations to the macro my_macro() without clashing names. This is the same as if you did: #define my_macro(a, b) __max_macro(__COUNTER__, __COUNTER__, (a), (b)) #define __my_macro(prefixa, prefixb, a, b) ({ typeof(a) CONCATENATE(A, prefixa) = (a); typeof(b) CONCATENATE(B, prefixb) = (b); MY_UNSAFE_MACRO(CONCATENATE(A, prefixa), CONCATENATE(B, prefixb)); }) ...but in my opinion, the first macro is easier to write and read. This patch starts by converting container_of() to use this new helper. Other macros may follow (like MIN, MAX, CLAMP, ...). Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-27udev: add missing new-line in udevadm errorDavid Herrmann
fprintf() does not add new-lines automatically like log_*() does. Add the missing \n specified so "udevadm" invoked without arguments adds a newline to: udevadm: missing or unknown command Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-27udev: hwdb - do not look at "usb_device" parentsKay Sievers
Based on a patch from Simon McVittie <simon.mcvittie@collabora.co.uk>. Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=758050 Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-22util: change return value of startswith() to non-consteudev/v1.10Lennart Poettering
This way we can use it on non-const strings, and don't end up with a const'ified result. This is similar to libc's strstr() which also takes a const string but returns a non-const one. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-22util: change return value of startswith() to non-constLennart Poettering
This way we can use it on non-const strings, and don't end up with a const'ified result. This is similar to libc's strstr() which also takes a const string but returns a non-const one. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-22configure.ac and src/libudev/Makefile.am: bump to 1.10 = upstream 216Anthony G. Basile
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-18src/scsi_id/Makefile.am,test/Makefile.am: fix build on debian jessie, issue #97Anthony G. Basile
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-17src/shared/mkdir.h: add missing func prototypeAnthony G. Basile
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-14src/shared/path-util.c: revert change from realpath to canonicalize_file_nameAnthony G. Basile
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-14src/shared: some stylistic changesAnthony G. Basile
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-14src/shared: import more code cleanups from upstreamAnthony G. Basile
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-14src/shared: import many code cleanups from upstreamAnthony G. Basile
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-13src/shared/cgroup-util.c: code cleanup following upstreamAnthony G. Basile
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-12udev: modernize net_id builtin a bitLennart Poettering
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-12udev: never bypass our own logging framework and call vsyslog() directly ↵Lennart Poettering
from udev tools Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-06src/libudev/libudev.sym: mark most symbols as hiddenAnthony G. Basile
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-05src/shared: refactor shared codeAnthony G. Basile
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-05src/{libudev,udev}: minor renamings from upstreamAnthony G. Basile
2014-08-05src/libudev/missing.h: clean up unused BTRFS_* declsAnthony G. Basile
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-05src/collect/collect.c: remove excessive error reportingAnthony G. Basile
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-05udev-builtin-keyboard: Allow numeric key codesMartin Pitt
Like with the old udev rules, allow hwdb entries to specify numeric key codes. Based on a patch from Mircea Miron. https://launchpad.net/bugs/1247584 Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-05udev: path_id - suppress ID_PATH for devices with an unknown parent device typeKay Sievers
https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1321816 Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-05Unify parse_argv styleZbigniew Jędrzejewski-Szmek
getopt is usually good at printing out a nice error message when commandline options are invalid. It distinguishes between an unknown option and a known option with a missing arg. It is better to let it do its job and not use opterr=0 unless we actually want to suppress messages. So remove opterr=0 in the few places where it wasn't really useful. When an error in options is encountered, we should not print a lengthy help() and overwhelm the user, when we know precisely what is wrong with the commandline. In addition, since help() prints to stdout, it should not be used except when requested with -h or --help. Also, simplify things here and there. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-05Include missing.h in udev-builtin-btrfs.c, and move BTRFS_IOC_DEVICES_READY ↵Anthony G. Basile
to missing.h This is a combination of upstream commits dced15575f7bf172e3c9d798c43477539525558c 7bed7f0e3b1f9596aedb64657e432e5b267adebb by Simon McVittie <simon.mcvittie@collabora.co.uk> 7bed7f0e3b1f9596aedb64657e432e5b267adebb Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-04man: add udev.conf(5)Zbigniew Jędrzejewski-Szmek
We generally have separate man pages for all configuration files. In this case udev.conf was already described in systemd-udevd.service(8), but it was hard to find. Docbook makes it hard to add a .so link from a different section, so describe udev.conf in its own page. Signedaoff-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-04Reject invalid quoted stringsZbigniew Jędrzejewski-Szmek
String which ended in an unfinished quote were accepted, potentially with bad memory accesses. Reject anything which ends in a unfished quote, or contains non-whitespace characters right after the closing quote. _FOREACH_WORD now returns the invalid character in *state. But this return value is not checked anywhere yet. Also, make 'word' and 'state' variables const pointers, and rename 'w' to 'word' in various places. Things are easier to read if the same name is used consistently. mbiebl_> am I correct that something like this doesn't work mbiebl_> ExecStart=/usr/bin/encfs --extpass='/bin/systemd-ask-passwd "Unlock EncFS"' mbiebl_> systemd seems to strip of the quotes mbiebl_> systemctl status shows mbiebl_> ExecStart=/usr/bin/encfs --extpass='/bin/systemd-ask-password Unlock EncFS $RootDir $MountPoint mbiebl_> which is pretty weird Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-04Fix misuse of uint64_t as size_tZbigniew Jędrzejewski-Szmek
They have different size on 32 bit, so they are really not interchangable. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-08-04libudev: set errno when udev_device_new_from_* or udev_device_get_parent_* failTom Gundersen
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-07-30udev: fixup commit dd5eddd28a74a49607a8fffcaf960040dba98479Hannes Reinecke
Commit dd5eddd28a74a49607a8fffcaf960040dba98479 accidentally removed one line too many. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-07-30udev: place opening { at the same line as the function declarationKay Sievers
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-07-30udev: unify event timeout handlingKay Sievers
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-07-30udevd: add --event-timeout commandline optionHannes Reinecke
Some events take longer than the default 30 seconds. Killing those events will leave the machine halfway configured. Add a commandline option '--event-timeout' to handle these cases. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-07-25udev: exclude MD from block device ownership event lockingKay Sievers
MD instantiates devices at open(). This is incomptible with the locking logic, as the "change" event emitted when stopping a device will bring it back. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
2014-07-19Be more careful when checking for empty filesZbigniew Jędrzejewski-Szmek
If we want to avoid reading a totally empty file, it seems better to check after we have opened the file, not before. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>