summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "DHCP DUID and IAID configurability"revert-2818-masterZbigniew Jędrzejewski-Szmek2016-03-2124-509/+44
|
* Merge pull request #2878 from martinpitt/masterDaniel Mack2016-03-211-3/+3
|\ | | | | test-copy: use correct data type for max_bytes
| * test-copy: use correct data type for max_bytesMartin Pitt2016-03-211-3/+3
|/ | | | | | | | copy_bytes() and the comparisons in test_copy_bytes_regular_file() expect an uint64_t, not a size_t. On 32 bit architectures the latter is 32 bit, leading to truncation errors. Fixes regression from commit 7a827fcb.
* Merge pull request #2760 from ronnychevalier/rc/core_no_new_privileges_seccompv3Daniel Mack2016-03-2111-33/+151
|\ | | | | core: set NoNewPrivileges for seccomp if we don't have CAP_SYS_ADMIN
| * test-execute: add nfsnobody alternative as a nobody userRonny Chevalier2016-02-288-7/+78
| |
| * core: set NoNewPrivileges for seccomp if we don't have CAP_SYS_ADMINRonny Chevalier2016-02-285-27/+74
| | | | | | | | | | | | | | | | | | | | | | | | The manpage of seccomp specify that using seccomp with SECCOMP_SET_MODE_FILTER will return EACCES if the caller do not have CAP_SYS_ADMIN set, or if the no_new_privileges bit is not set. Hence, without NoNewPrivilege set, it is impossible to use a SystemCall* directive with a User directive set in system mode. Now, NoNewPrivileges is set if we are in user mode, or if we are in system mode and we don't have CAP_SYS_ADMIN, and SystemCall* directives are used.
* | Merge pull request #2826 from thom311/masterDaniel Mack2016-03-211-7/+10
|\ \ | | | | | | lldp: fix starting ttl timer for lldp neighbor
| * | lldp: fix starting ttl timer for lldp neighborThomas Haller2016-03-141-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | lldp_start_timer() was only called during sd_lldp_get_neighbors(). Ensure that the timer is (re-)started when a new neighbor appears. Otherwise, the timer is not started when relying on the events alone. Fixes: 34437b4f9c9c51b0a6f93788bdb9a105b8e46b66
* | | Merge pull request #2875 from evverx/nspawn-template-bash-completionDaniel Mack2016-03-211-2/+2
|\ \ \ | | | | | | | | bash completion: add --template to nspawn
| * | | bash completion: add --template to nspawnEvgeny Vereshchagin2016-03-201-2/+2
|/ / /
* | | man: fix typo in systemd-sysv-generatorMichael Biebl2016-03-201-1/+1
| | |
* | | Merge pull request #2865 from utezduyar/journald-uploadDaniel Mack2016-03-181-28/+28
|\ \ \ | | | | | | | | journal-upload: remove microhttpd dependency
| * | | journal-upload: remove microhttpd dependencyUmut Tezduyar Lindskog2016-03-181-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | journal-upload doesn't really need microhttpd to run. Without the dependency, we can cross compile systemd without microhttpd and get the uploader part of the remote logging. Change-Id: I28dfa5ad2aae94e50de1d32713e1827623c3fd1d
* | | | Merge pull request #2862 from evverx/nspawn-expose-ports-errorDaniel Mack2016-03-181-0/+7
|\ \ \ \ | |/ / / |/| | | nspawn: don't run nspawn --port=... without libiptc support
| * | | nspawn: don't run nspawn --port=... without libiptc supportEvgeny Vereshchagin2016-03-171-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We get $ systemd-nspawn --image /dev/loop1 --port 8080:80 -n -b 3 --port= is not supported, compiled without libiptc support. instead of a ping-nc-iptables debugging session
* | | | hwdb: Update database of Bluetooth company identifiersMarcel Holtmann2016-03-181-1/+238
| | | |
* | | | Merge pull request #2839 from keszybz/use-sendfile-smarterDaniel Mack2016-03-177-230/+438
|\ \ \ \ | | | | | | | | | | Use sendfile smarter
| * | | | basic/missing: move syscall definitions to basic/missing_syscall.hZbigniew Jędrzejewski-Szmek2016-03-173-243/+312
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a bunch of syscall wrapper definitions and it's easier to see that they follow the same pattern if they are not interspersed with other defines. Change the wrappers to be uniform: - if __NR_XXX is not defined, do not bother to call the syscall, and return -1/ENOSYS immediately. - do not check __NR_XXX defines if we detect the symbol as defined, since we don't need them anyway - reindent stuff for readability New file basic/missing_syscall.h is included at the end of missing.h because it might make use of some of the definitions in missing.h.
| * | | | basic/copy: use copy_file_range()Zbigniew Jędrzejewski-Szmek2016-03-172-4/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For btrfs, c_f_r() is like BTRFS_IOC_CLONE which we already used, but also works when max_bytes is set. We do call copy_bytes in coredump code with max_bytes set, and for large files, so we might see some benefit from using c_f_r() on btrfs. For other filesystems, c_f_r() falls back to do_splice_direct(), the same as sendfile, which we already call, so there shouldn't be much difference. Tested with test-copy and systemd-coredump on Linux 4.3 (w/o c_f_r) and 4.5 (w/ c_f_r).
| * | | | basic/missing: add copy_file_rangeZbigniew Jędrzejewski-Szmek2016-03-172-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | syscall numbers based on: https://fedora.juszkiewicz.com.pl/syscalls.html
| * | | | test-copy: test with different max_bytes valuesZbigniew Jędrzejewski-Szmek2016-03-151-10/+25
| | | | |
| * | | | basic/copy: use sendfile smarterZbigniew Jędrzejewski-Szmek2016-03-151-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We called sendfile with 16kb (a.k.a. COPY_BUFFER_SIZE) as the maximum number of bytes to copy. This seems rather inefficient, especially with large files. Instead, call sendfile with a "large" maximum. What "large" max means is a bit tricky: current file offset + max must fit in loff_t. This means that as we call sendfile more than once, we have to lower the max size. With this patch, test-copy calls sendfile twice, e.g.: sendfile(4, 3, NULL, 9223372036854775807) = 738760 sendfile(4, 3, NULL, 9223372036854037047) = 0 The second call is necessary to determine EOF.
| * | | | test-copy: add a test shuffling bytes between normal filesZbigniew Jędrzejewski-Szmek2016-03-151-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I started looking into adding copy_file_range support, and discovered that we can improve the way we call sendfile: - sendfile(2) man page is missing an important bit: the number of bytes to copy cannot be too big (SSIZE_MAX actually), and the description of EINVAL return code does not mention this either, - our implementation works but calls sendfile over and over with a small size, which seems suboptimal. First add a test which (under strace) can be used to see current behaviour.
* | | | | Merge pull request #2854 from keszybz/log-colorsDaniel Mack2016-03-173-14/+34
|\ \ \ \ \ | | | | | | | | | | | | systemd: obey systemd.log_color config
| * | | | | systemd: obey systemd.log_color configZbigniew Jędrzejewski-Szmek2016-03-173-14/+34
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #2845.
* | | | | | Merge pull request #2856 from msekletar/merge-instanceDaniel Mack2016-03-171-1/+13
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | core: look for instance when processing template name
| * | | | | core: look for instance when processing template nameMichal Sekletar2016-03-161-1/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If first attempt to merge units failed and we are trying to do merge the other way around and at the same time we are working with template name, then other unit can't possibly be template, because it is not possible to have template unit running, only instances of the template. Thus we need to look for already active instance instead.
* | | | | Merge pull request #2858 from keszybz/fbdev-uaccessDavid Herrmann2016-03-171-1/+2
|\ \ \ \ \ | | | | | | | | | | | | rules: allow users to access frame buffer devices
| * | | | | rules: allow users to access frame buffer devicesZbigniew Jędrzejewski-Szmek2016-03-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example it allows weston to be started unprivileged. Related discussion: https://bugs.freedesktop.org/show_bug.cgi?id=73782 https://lists.freedesktop.org/archives/wayland-devel/2015-May/022005.html https://bugzilla.redhat.com/show_bug.cgi?id=1226680
* | | | | | Merge pull request #2848 from keszybz/clang-warningsDaniel Mack2016-03-173-7/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Clang warnings
| * | | | | | basic/log: remove unused return valueZbigniew Jędrzejewski-Szmek2016-03-151-1/+0
| | | | | | |
| * | | | | | basic/c-rbtree: remove unused functionZbigniew Jędrzejewski-Szmek2016-03-151-5/+0
| | | | | | |
| * | | | | | basic/macros: clang 3.5 doesn't support alloc_sizeZbigniew Jędrzejewski-Szmek2016-03-151-1/+5
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The attribute was removed in commit c047507 in the clang repository as it was never properly implemented anyway. Avoid using the attribute with clang because it generates a ton of annoying warnings.
* | | | | | Merge pull request #2859 from msekletar/ldconfig-after-localfsZbigniew Jędrzejewski-Szmek2016-03-171-2/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | units: run ldconfig.service after we have mounted all local file systems
| * | | | | units: run ldconfig.service after we have mounted all local file systemsMichal Sekletar2016-03-171-2/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Also drop ConditionNeedsUpdate=|/etc. Regardless if system is updated online or offline, updating dynamic loader cache should always be responsibility of packaging tools/scripts.
* | | | | Merge pull request #2855 from tklauser/masterZbigniew Jędrzejewski-Szmek2016-03-161-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | nspawn: Fix two misspellings of "hierarchy" in error messages
| * | | | nspawn: Fix two misspellings of "hierarchy" in error messagesTobias Klauser2016-03-161-2/+2
|/ / / /
* | | | Merge pull request #2851 from eliasp/patch-1Martin Pitt2016-03-161-1/+1
|\ \ \ \ | | | | | | | | | | Reference correct `machinectl` command in 219 NEWS
| * | | | Reference correct `machinectl` command in 219 NEWSElias Probst2016-03-161-1/+1
|/ / / / | | | | | | | | | | | | NEWS for `219` references `machinectl list-images` to describe the introduced clone feature - this looks like a copy'n'paste problem. Use `machinectl clone` instead.
* | | | Merge pull request #2797 from evverx/selinux-use-rawZbigniew Jędrzejewski-Szmek2016-03-163-7/+18
|\ \ \ \ | | | | | | | | | | selinux: use *_raw API from libselinux
| * | | | selinux: use *_raw API from libselinuxEvgeny Vereshchagin2016-03-042-7/+7
| | | | | | | | | | | | | | | | | | | | This is a follow-up to 5c5433ad32
| * | | | tests: add create_strace_wrapperEvgeny Vereshchagin2016-03-041-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Very handy for early-boot debugging See https://github.com/systemd/systemd/pull/2781#discussion_r54782628
* | | | | Merge pull request #2842 from petrosagg/nspawn-doc-fixZbigniew Jędrzejewski-Szmek2016-03-152-3/+14
|\ \ \ \ \ | | | | | | | | | | | | man: document missing KillSignal= .nspawn option
| * | | | | man: document missing KillSignal= .nspawn optionPetros Angelatos2016-03-152-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Petros Angelatos <petrosagg@gmail.com>
* | | | | | Merge pull request #2843 from NetworkManager/clock_boottimeZbigniew Jędrzejewski-Szmek2016-03-151-2/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | time-util: fall back to CLOCK_MONOTONIC if CLOCK_BOOTTIME unsupported
| * | | | | | time-util: fall back to CLOCK_MONOTONIC if CLOCK_BOOTTIME unsupportedLubomir Rintel2016-03-151-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was added in 2.6.39, and causes an assertion to fail when running in mock hosted on 2.6.23-based RHEL-6: Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at systemd/src/basic/time-util.c:70, function now(). Aborting.
* | | | | | | Merge pull request #2847 from whot/hwdb-updatesZbigniew Jędrzejewski-Szmek2016-03-151-0/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | hwdb: correct resolution for Asus x550cc
| * | | | | | hwdb: correct resolution for Asus x550ccPeter Hutterer2016-03-161-0/+6
|/ / / / / / | | | | | | | | | | | | | | | | | | https://bugzilla.redhat.com/show_bug.cgi?id=1316655
* | | | | | Merge pull request #2840 from linkmauve/use-xdg-config-homeZbigniew Jędrzejewski-Szmek2016-03-151-2/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | sd-path: use XDG_CONFIG_HOME instead of hardcoding ~/.config for user-dirs
| * | | | | sd-path: use XDG_CONFIG_HOME instead of hardcoding ~/.config for user-dirsEmmanuel Gil Peyrot2016-03-151-2/+7
| | |/ / / | |/| | |
View Lorry Controller Status