summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* hwdb: Add SteelSeries Sensei Raw mouseMartin Pitt2016-04-111-0/+8
| | | | Fixes #3009
* Merge pull request #3002 from robertwec/masterMartin Pitt2016-04-101-0/+16
|\ | | | | hwdb: Add MODECOM MC-WM4 and Sharkoon Shark Force
| * hwdb: Add MODECOM MC-WM4 and Sharkoon Shark ForceRobert Węcławski2016-04-101-0/+16
| |
* | Merge pull request #3004 from tsmock/masterMartin Pitt2016-04-101-0/+8
|\ \ | |/ |/| hwdb/70-mouse.hwdb: Add Dynex Wired Mouse (DX-WMSE2)
| * hwdb/70-mouse.hwdb: Add Dynex Wired Mouse (DX-WMSE2)Taylor Smock2016-04-091-0/+8
|/
* Merge pull request #2990 from evverx/sys-depends-on-sys-tar-xzLennart Poettering2016-04-081-1/+3
|\ | | | | build-sys: test/sys depends on test/sys.tar.xz
| * build-sys: test/sys depends on test/sys.tar.xzEvgeny Vereshchagin2016-04-081-1/+3
|/ | | | | | | | | | | | | | | | | | | | | | | Fixes: $ ls -ld test/sys drwxr-xr-x. 12 vagrant vagrant 4096 Jan 6 2012 test/sys $ git pull Updating d4337c1..710a885 Fast-forward ... test/sys.tar.xz | Bin 261380 -> 165116 bytes test/udev-test.pl | 67 ++++++++++++----- $ sudo make check TESTS=test/udev-test.pl ... FAIL: test/udev-test.pl $ rm -r test/sys $ make test/sys $ sudo make check TESTS=test/udev-test.pl ... PASS: test/udev-test.pl
* Merge pull request #2985 from keszybz/lldp-assertMartin Pitt2016-04-082-2/+4
|\ | | | | Replace if with assert_cc in lldp code and a build-sys tweak
| * lldp: replace if with assert_ccZbigniew Jędrzejewski-Szmek2016-04-071-2/+1
| | | | | | | | | | | | | | LLDP_TX_HOLD or one of the other variables might be changed in the future resulting in a silent error here if the if was just removed. Replacement for #2983.
| * build-sys: force generation of triggers.systemd fileZbigniew Jędrzejewski-Szmek2016-04-071-0/+3
| | | | | | | | | | | | | | | | We don't want to actually install it anywhere, because it is only usable copied or %included directly into a spec file, and must be available before %prep is run. But still, it's useful to generate it automatically so it's easier to copy and it doesn't go stale.
* | Merge pull request #2943 from vinaykul/systemd_duid_review_fixesZbigniew Jędrzejewski-Szmek2016-04-075-150/+62
|\ \ | | | | | | DHCP DUID parsing fix, logging fix, man-page fix
| * | Drop description of 'Type' field from docs.Vinay Kulkarni2016-04-042-34/+0
| | |
| * | Address code-review items for pull-request #2890Vinay Kulkarni2016-04-045-138/+84
| | | | | | | | | | | | | | | | | | | | | | | | 1. Replace strtol with unhexchar, verified with valid and invalid DUID strings. 2. Fix logging to use log_syntax instead of log_error. 3. On error reading DUID, ignore read and preserve previous state. 4. Fix man-pages to use markup, remove options not yet implemented. 5. Remove spurious header line in new files.
* | | Merge pull request #2987 from CyberShadow/pull-20160407-234344Zbigniew Jędrzejewski-Szmek2016-04-071-1/+1
|\ \ \ | |_|/ |/| | core: downgrade warning about duplicate device names again
| * | core: downgrade warning about duplicate device names againVladimir Panteleev2016-04-071-1/+1
|/ / | | | | | | | | | | | | | | | | Pull request #2412 seemed to have unintentionally reverted 5259bcf6a638d8d489db1ddefd55327aa15f3e51, thus reintroducing https://bugs.freedesktop.org/show_bug.cgi?id=90386. This commit reverts that part of the commit, changing the log level to debug again.
* | Merge pull request #2981 from keszybz/test-nssMartin Pitt2016-04-071-1/+1
|\ \ | | | | | | build-sys: move test-nss to manual_tests
| * | build-sys: move test-nss to manual_testsZbigniew Jędrzejewski-Szmek2016-04-071-1/+1
| | |
* | | Merge pull request #2976 from martinpitt/udev-test-tagsZbigniew Jędrzejewski-Szmek2016-04-062-7/+40
|\ \ \ | | | | | | | | Add tags tests to udev-test.pl
| * | | sd-device: Allocate enough room for tags stringMartin Pitt2016-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | Fix commit 1d88a2: We need to allocate another byte for building the "tags" string, as we append an extra ':' and still need the NUL terminator.
| * | | test: udev: Check tagsMartin Pitt2016-04-061-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add two more tests: - Add a single tag, match on it, don't match on another. - Add 10.000 tags to a device, ensure that udev survives this. (Reproduces crash fixed by commit 1d88a271a)
| * | | test: udev: check exit code of test-udevMartin Pitt2016-04-061-6/+15
| | | | | | | | | | | | | | | | | | | | We expect test-udev to succeed. Verify that its exit code is zero, particularly to spot crashes (e. g. a segfault would be error code 139).
* | | | Merge pull request #2972 from lnykryn/curlLennart Poettering2016-04-061-1/+1
|\ \ \ \ | | | | | | | | | | configure.ac: bump curl dependency to 7.32.0
| * | | | configure.ac: bump curl dependency to 7.32.0Lukas Nykryn2016-04-061-1/+1
|/ / / / | | | | | | | | | | | | We are using CURLOPT_XFERINFOFUNCTION which was added in 7.32.0.
* | | | Merge pull request #2970 from msekletar/machine-id-prefix-rootaZbigniew Jędrzejewski-Szmek2016-04-061-24/+4
|\ \ \ \ | |/ / / |/| | | machine-id-setup: simplify by using prefix_roota
| * | | machine-id-setup: simplify by using prefix_rootaMichal Sekletar2016-04-061-24/+4
| | | |
* | | | Merge pull request #2971 from torstehu/fix-typoMartin Pitt2016-04-062-2/+2
|\ \ \ \ | | | | | | | | | | man: fix spelling mistakes
| * | | | man: fix spelling mistakesTorstein Husebø2016-04-062-2/+2
|/ / / /
* | | | Merge pull request #2969 from evverx/udev-test-dont-rely-on-underlying-fs-2Martin Pitt2016-04-063-12/+12
|\ \ \ \ | | | | | | | | | | tests: don't rely on the underlying fs in test-udev (v2)
| * | | | tests: don't rely on the underlying fs in test-udev (v2)Evgeny Vereshchagin2016-04-063-12/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This reverts commit 646048b40a7b62c4e9bc59024ef6133613cda01b. Let's test really big numbers again * Don't be so brutal: use rmdir instead of rm -rf As suggested https://github.com/systemd/systemd/pull/2966#issuecomment-205751680
* | | | Merge pull request #2968 from keszybz/journal-upload-watchdog-update-masterLennart Poettering2016-04-063-0/+25
|\ \ \ \ | | | | | | | | | | Journal upload watchdog update master
| * | | | journal-upload: make watchdog state non-staticZbigniew Jędrzejewski-Szmek2016-04-053-16/+14
| | | | | | | | | | | | | | | | | | | | Also parse watchdog config when creating the Uploader object.
| * | | | journal-upload: Update watchdog while in curl_easy_performKlearchos Chaloulos2016-04-053-0/+27
| | | | | | | | | | | | | | | | | | | | It is observed that a combination of high log throughput, low I/O speed on journal remote side and many nodes uploading simultaneously caused the journal-upload process to dump core because of watchdog starvation. This is caused because journal-upload stays in curl_easy_perform(), because it cannot upload fast enough to reach the end of the journal. Currently journal-upload will return from curl_easy_perform() only when the end of the journal is reached. Therefore a check is added in journal_input_callback(), which will update the watchdog if the elapsed time since the start of the uploading process is greater than WATCHDOG_USEC/2.
* | | | | Merge pull request #2944 from keszybz/man-coredump-sysctlLennart Poettering2016-04-0613-41/+143
|\ \ \ \ \ | | | | | | | | | | | | Man coredump sysctl
| * | | | | man: also mention systemd-coredump@.service and systemd-coredump.socketZbigniew Jędrzejewski-Szmek2016-04-052-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | Added in 3c171f0b1e.
| * | | | | compress: fix gcc warnings about void* used in arithmeticZbigniew Jędrzejewski-Szmek2016-04-021-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | src/journal/compress.c: In function ‘compress_blob_lz4’: src/journal/compress.c:115:49: warning: pointer of type ‘void *’ used in arithmetic [-Wpointer-arith] r = LZ4_compress_limitedOutput(src, dst + 8, src_size, (int) dst_alloc_size - 8); ^ src/journal/compress.c: In function ‘decompress_blob_xz’: src/journal/compress.c:179:35: warning: pointer of type ‘void *’ used in arithmetic [-Wpointer-arith] s.next_out = *dst + used; ^ src/journal/compress.c: In function ‘decompress_blob_lz4’: src/journal/compress.c:218:37: warning: pointer of type ‘void *’ used in arithmetic [-Wpointer-arith] r = LZ4_decompress_safe(src + 8, out, src_size - 8, size); ^ src/journal/compress.c: In function ‘decompress_startswith_xz’: src/journal/compress.c:294:38: warning: pointer of type ‘void *’ used in arithmetic [-Wpointer-arith] s.next_out = *buffer + *buffer_size - s.avail_out; ^ src/journal/compress.c:294:53: warning: pointer of type ‘void *’ used in arithmetic [-Wpointer-arith] s.next_out = *buffer + *buffer_size - s.avail_out; ^ src/journal/compress.c: In function ‘decompress_startswith_lz4’: src/journal/compress.c:327:45: warning: pointer of type ‘void *’ used in arithmetic [-Wpointer-arith] r = LZ4_decompress_safe_partial(src + 8, *buffer, src_size - 8, ^ LZ4 and XZ functions use char* and unsigned char*, respectively, so keep void* in our internal APIs and add casts.
| * | | | | basic/copy: remove unnecessary castZbigniew Jędrzejewski-Szmek2016-04-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Both types are unsigned, so the cast to the longer type is automatic.
| * | | | | test-compress-benchmark: fix argument parsing on 32bitZbigniew Jędrzejewski-Szmek2016-04-023-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch is not minimal, but a function to parse size_t is probably going to come in handy in other places, so I think it's nicer to define a proper parsing function than to open-code the cast.
| * | | | | Add networkd-gperf.c to gitignoreZbigniew Jędrzejewski-Szmek2016-04-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | For #2915.
| * | | | | sd-lldp.h: remove double newlineZbigniew Jędrzejewski-Szmek2016-04-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | For #2898.
| * | | | | man: describe how to reload sysctl configurationZbigniew Jędrzejewski-Szmek2016-04-022-10/+68
| | | | | | | | | | | | | | | | | | | | | | | | Also fixes option name (s/--path/--prefix/).
| * | | | | man: add more cross-references to coredump.conf(5) and systemd-coredump(8)Zbigniew Jędrzejewski-Szmek2016-04-022-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #2901.
| * | | | | coredumpctl: grammaro fixZbigniew Jędrzejewski-Szmek2016-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Mentioned in #2901.
| * | | | | rpm triggers: add note about minimum supported versionZbigniew Jędrzejewski-Szmek2016-04-021-0/+2
| | | | | |
| * | | | | man: move KillSignal in the right section in directives listZbigniew Jędrzejewski-Szmek2016-04-021-1/+1
| | | | | |
* | | | | | Merge pull request #2947 from keszybz/test-nssLennart Poettering2016-04-069-98/+580
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | Add a test for nss modules and some related fixes
| * | | | | nss-myhostname: remove dead test of variable that was not setZbigniew Jędrzejewski-Szmek2016-04-051-3/+2
| | | | | |
| * | | | | test-nss: test the resolution of various namesZbigniew Jędrzejewski-Szmek2016-04-055-1/+482
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nss-dns is also "tested". It should be almost always available, and provides a reference for comparison.
| * | | | | string-table: split long definitionsZbigniew Jędrzejewski-Szmek2016-04-051-21/+33
| | | | | |
| * | | | | Move nss typedefs into nss-util.hZbigniew Jędrzejewski-Szmek2016-04-022-54/+49
| | | | | | | | | | | | | | | | | | | | | | | | In preparation for subsequent changes.
| * | | | | nss-myhostname: trivial style fixesZbigniew Jędrzejewski-Szmek2016-04-022-19/+14
| | | | | |