Lukas Nykryn [Wed, 30 Mar 2016 11:49:50 +0000 (13:49 +0200)]
core: improve error message when starting template without instance
Zbigniew Jędrzejewski-Szmek [Wed, 30 Mar 2016 01:00:58 +0000 (21:00 -0400)]
Merge pull request #2898 from bengal/lldp-api
lldp: move public macros to sd-lldp.h and namespace them
Zbigniew Jędrzejewski-Szmek [Wed, 30 Mar 2016 00:25:00 +0000 (20:25 -0400)]
Merge pull request #2903 from keszybz/cgroup2-v3
core: cgroup2 support
Daniel Mack [Tue, 29 Mar 2016 14:06:30 +0000 (16:06 +0200)]
Merge pull request #2911 from evverx/shutdown-watchdog-infinity
core: ShutdownWatchdogSec=infinity disables the watchdog logic too
Evgeny Vereshchagin [Tue, 29 Mar 2016 11:04:04 +0000 (11:04 +0000)]
core: ShutdownWatchdogSec=infinity disables the watchdog logic too
This is a follow-up for
947292eef
Daniel Mack [Tue, 29 Mar 2016 08:35:52 +0000 (10:35 +0200)]
Merge pull request #2907 from evverx/runtime-watchdog-infinity
core: RuntimeWatchdogSec=infinity disables the watchdog logic
Daniel Mack [Tue, 29 Mar 2016 08:35:07 +0000 (10:35 +0200)]
Merge pull request #2905 from keszybz/gcrypt-compilation
build-sys: fix build with libgrcypt disabled
Evgeny Vereshchagin [Mon, 28 Mar 2016 17:17:32 +0000 (17:17 +0000)]
core: RuntimeWatchdogSec=infinity disables the watchdog logic
Zbigniew Jędrzejewski-Szmek [Mon, 28 Mar 2016 14:26:42 +0000 (10:26 -0400)]
Merge pull request #2906 from Lu-Biao/shared
shared: fix a misspelling of "journalctl"
Biao Lu [Mon, 28 Mar 2016 17:46:04 +0000 (01:46 +0800)]
shared: fix a misspelling of "journalctl"
Zbigniew Jędrzejewski-Szmek [Sun, 27 Mar 2016 21:33:54 +0000 (17:33 -0400)]
build-sys: fix build with libgrcypt disabled
- Move gcrypt.h include inside grcrypt-util.h.
- Allow gcrypt-util.[ch] to be compiled even without gcrypt.
This allows the logic in files using gcrypt to be simplified.
- Fix compilation of systemd-resolve without gcrypt.
systemd-resolved already supported that.
Fixes #2711.
Tejun Heo [Fri, 25 Mar 2016 15:38:50 +0000 (11:38 -0400)]
core: update invoke_sigchld_event() to handle NULL ->sigchld_event()
After receiving SIGCHLD, one of the ways manager_dispatch_sigchld() maps the
now zombie $PID to its unit is through manager_get_unit_by_pid_cgroup() which
reads /proc/$PID/cgroup and looks up the unit associated with the cgroup path.
On non-unified cgroup hierarchies, a process is immediately migrated to the
root cgroup on death and the cgroup lookup would always have returned the unit
associated with it, making it rather pointless but safe. On unified hierarchy,
a zombie remains associated with the cgroup that it was associated with at the
time of death and thus manager_get_unit_by_pid_cgroup() will look up the unit
properly.
However, by the time manager_dispatch_sigchld() is running, the original cgroup
may have become empty and it and its associated unit might already have been
removed. If the cgroup path doesn't yield a match, manager_dispatch_sigchld()
keeps pruning the leaf component. This means that the function may return a
slice unit for a pid and as a slice doesn't have ->sigchld_event() handler,
calling invoke_sigchld_event() on it causes a segfault.
This patch updates invoke_sigchld_event() so that it skips calling if the
handler is not set.
Tejun Heo [Fri, 25 Mar 2016 15:38:50 +0000 (11:38 -0400)]
core: update populated event handling in unified hierarchy
Earlier during the development of unified hierarchy, the populated event was
reported through by the dedicated "cgroup.populated" file; however, the
interface was updated so that it's reported through the "populated" field of
"cgroup.events" file. Update populated event handling logic accordingly.
Alban Crequy [Mon, 7 Dec 2015 00:10:50 +0000 (01:10 +0100)]
cgroup2: use new fstype for unified hierarchy
Since Linux v4.4-rc1, __DEVEL__sane_behavior does not exist anymore and
is replaced by a new fstype "cgroup2".
With this patch, systemd no longer supports the old (unstable) way of
doing unified hierarchy with __DEVEL__sane_behavior and systemd now
requires Linux v4.4 for unified hierarchy.
Non-unified hierarchy is still the default and is unchanged by this
patch.
https://github.com/torvalds/linux/commit/
67e9c74b8a873408c27ac9a8e4c1d1c8d72c93ff
Zbigniew Jędrzejewski-Szmek [Fri, 25 Mar 2016 21:06:50 +0000 (17:06 -0400)]
Merge pull request #2887 from martinpitt/master
Fix logind crash if shutdown is called from a non-tty
Beniamino Galvani [Wed, 23 Mar 2016 17:47:26 +0000 (18:47 +0100)]
lldp: move public macros to sd-lldp.h and namespace them
lldp.h contains definitions of LLDP types, subtypes and capabilities which
should be exposed in public headers. Get rid of the file and move those
definitions to sd-lldp.h with the SD_ prefix.
Daniel Mack [Thu, 24 Mar 2016 09:37:19 +0000 (10:37 +0100)]
Merge pull request #2892 from yuwata/localectl
localectl: remove an unnecessary line break from and align the output of status command
Martin Pitt [Wed, 23 Mar 2016 07:46:58 +0000 (08:46 +0100)]
logind: fix crash when shutdown is not issued from a tty
It's possible that sd_bus_creds_get_tty() fails and thus
scheduled_shutdown_tty is NULL in method_schedule_shutdown().
Fix logind_wall_tty_filter() to get along with that, by showing the message on
all TTYs, instead of crashing in strcmp().
https://launchpad.net/bugs/1553040
Martin Pitt [Wed, 23 Mar 2016 07:46:39 +0000 (08:46 +0100)]
core: fix "stoppping" typo
Yu Watanabe [Thu, 24 Mar 2016 01:58:38 +0000 (10:58 +0900)]
localectl: align output of 'localectl status' command
If kernel command line options for locale are given,
the output of 'localectl status' command is not aligned,
for example,
=============
Warning: Settings on kernel command line override system locale settings in /etc/locale.conf.
Command Line: LANG=C
System Locale: LANG=C
VC Keymap: n/a
X11 Layout: n/a
=============
This commit fixes the alignment.
Yu Watanabe [Thu, 24 Mar 2016 01:44:36 +0000 (10:44 +0900)]
localectl: remove unnecessary line break
If /etc/locale.conf is empty or does not exist, the output of
'localectl status' command includes an unnecessary line break
as follows:
=======================
System Locale: n/a
VC Keymap: n/a
X11 Layout: n/a
=======================
This commit removes the line break after the system locale.
Daniel Mack [Wed, 23 Mar 2016 18:48:26 +0000 (19:48 +0100)]
Merge pull request #2885 from gbrikis/master
core: Fix path for opening ffs endpoint ep0
Daniel Mack [Wed, 23 Mar 2016 17:06:07 +0000 (18:06 +0100)]
Merge pull request #2888 from kinvolk/iaguis/remove-dots
run: remove period when printing started units
Georgia Brikis [Tue, 22 Mar 2016 11:08:42 +0000 (12:08 +0100)]
core: Fix path for opening ffs endpoint ep0
usbffs_address_create() expects an absolute path to the file that is
supposed to be opened. The path specified only leads to the directory
containing the endpoint ep0 not the endpoint itself. This commit adds
the endpoints name to the path.
Iago López Galeiras [Wed, 23 Mar 2016 14:45:32 +0000 (15:45 +0100)]
run: remove period when printing started units
If you start a unit with systemd-run you usually need its name to
inspect it or stop it. Removing the period makes copying the unit name
easier.
Daniel Mack [Wed, 23 Mar 2016 12:08:04 +0000 (13:08 +0100)]
Merge pull request #2886 from fbuihuu/systemctl-list-units-inactive-state
systemctl: no need to pass --all if inactive is explicitly requested …
Daniel Mack [Wed, 23 Mar 2016 12:00:33 +0000 (13:00 +0100)]
Merge pull request #2883 from keszybz/allow-boms
Ignore BOM in config files
Franck Bui [Wed, 23 Mar 2016 06:47:00 +0000 (07:47 +0100)]
systemctl: no need to pass --all if inactive is explicitly requested in list-units
If list-units command is explicitly asked to show inactive units
by using '--state=inactive' option, there's no need to force the user
to pass '--all' option to include inactive units in the search in
this case.
Zbigniew Jędrzejewski-Szmek [Tue, 22 Mar 2016 03:34:13 +0000 (23:34 -0400)]
Ignore BOM in config files
Fixes #2823.
Also remove unnecessary feof check.
Zbigniew Jędrzejewski-Szmek [Tue, 22 Mar 2016 15:00:20 +0000 (11:00 -0400)]
Merge pull request #2844 from yarda/uaccess-3dprinters
Add support for 3D printers to uaccess (ID_3DPRINTER).
Jaroslav Škarvada [Tue, 15 Mar 2016 13:25:51 +0000 (14:25 +0100)]
Added support for 3D printers to uaccess (ID_MAKER_TOOL)
This is to support 3D printers, CNCs, laser cutters, 3D scanners, etc.
Daniel Mack [Tue, 22 Mar 2016 09:23:12 +0000 (10:23 +0100)]
Merge pull request #2880 from keszybz/more-tests
Add some simple tests for env_value_is_valid and env_assignment_is_valid
Zbigniew Jędrzejewski-Szmek [Tue, 22 Mar 2016 03:38:28 +0000 (23:38 -0400)]
Merge pull request #2879 from ronnychevalier/rc/test_execute_fix
test-execute: fix execution of AmbientCapabilities tests
Zbigniew Jędrzejewski-Szmek [Tue, 22 Mar 2016 02:30:53 +0000 (22:30 -0400)]
Merge pull request #2882 from systemd/revert-2818-master
Revert "DHCP DUID and IAID configurability"
Zbigniew Jędrzejewski-Szmek [Mon, 21 Mar 2016 22:24:24 +0000 (18:24 -0400)]
Revert "DHCP DUID and IAID configurability"
Zbigniew Jędrzejewski-Szmek [Mon, 21 Mar 2016 20:45:37 +0000 (16:45 -0400)]
test-env-util: test env_{value,assignment}_is_valid
Just to make sure everything works as expected in relation
to https://bugzilla.redhat.com/show_bug.cgi?id=1312384.
Zbigniew Jędrzejewski-Szmek [Mon, 21 Mar 2016 20:17:18 +0000 (16:17 -0400)]
tests: rename test-env-replace to test-env-util
Ronny Chevalier [Mon, 21 Mar 2016 17:40:07 +0000 (18:40 +0100)]
test-execute: fix execution of AmbientCapabilities tests
Wrong tests were executed
Daniel Mack [Mon, 21 Mar 2016 15:47:31 +0000 (16:47 +0100)]
Merge pull request #2878 from martinpitt/master
test-copy: use correct data type for max_bytes
Martin Pitt [Mon, 21 Mar 2016 13:55:30 +0000 (14:55 +0100)]
test-copy: use correct data type for max_bytes
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.
Daniel Mack [Mon, 21 Mar 2016 11:57:43 +0000 (12:57 +0100)]
Merge pull request #2760 from ronnychevalier/rc/core_no_new_privileges_seccompv3
core: set NoNewPrivileges for seccomp if we don't have CAP_SYS_ADMIN
Daniel Mack [Mon, 21 Mar 2016 11:44:38 +0000 (12:44 +0100)]
Merge pull request #2826 from thom311/master
lldp: fix starting ttl timer for lldp neighbor
Daniel Mack [Mon, 21 Mar 2016 10:45:23 +0000 (11:45 +0100)]
Merge pull request #2875 from evverx/nspawn-template-bash-completion
bash completion: add --template to nspawn
Evgeny Vereshchagin [Sun, 20 Mar 2016 17:55:58 +0000 (17:55 +0000)]
bash completion: add --template to nspawn
Michael Biebl [Sun, 20 Mar 2016 01:24:30 +0000 (02:24 +0100)]
man: fix typo in systemd-sysv-generator
Daniel Mack [Fri, 18 Mar 2016 12:48:00 +0000 (13:48 +0100)]
Merge pull request #2865 from utezduyar/journald-upload
journal-upload: remove microhttpd dependency
Daniel Mack [Fri, 18 Mar 2016 11:00:29 +0000 (12:00 +0100)]
Merge pull request #2862 from evverx/nspawn-expose-ports-error
nspawn: don't run nspawn --port=... without libiptc support
Umut Tezduyar Lindskog [Fri, 18 Mar 2016 10:34:51 +0000 (11:34 +0100)]
journal-upload: remove microhttpd dependency
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
Marcel Holtmann [Fri, 18 Mar 2016 00:05:51 +0000 (01:05 +0100)]
hwdb: Update database of Bluetooth company identifiers
Evgeny Vereshchagin [Thu, 17 Mar 2016 21:06:17 +0000 (21:06 +0000)]
nspawn: don't run nspawn --port=... without libiptc support
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
Daniel Mack [Thu, 17 Mar 2016 19:33:41 +0000 (20:33 +0100)]
Merge pull request #2839 from keszybz/use-sendfile-smarter
Use sendfile smarter
Daniel Mack [Thu, 17 Mar 2016 19:30:16 +0000 (20:30 +0100)]
Merge pull request #2854 from keszybz/log-colors
systemd: obey systemd.log_color config
Daniel Mack [Thu, 17 Mar 2016 19:24:39 +0000 (20:24 +0100)]
Merge pull request #2856 from msekletar/merge-instance
core: look for instance when processing template name
Zbigniew Jędrzejewski-Szmek [Thu, 17 Mar 2016 17:26:13 +0000 (13:26 -0400)]
basic/missing: move syscall definitions to basic/missing_syscall.h
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.
Zbigniew Jędrzejewski-Szmek [Tue, 15 Mar 2016 23:26:34 +0000 (19:26 -0400)]
basic/copy: use copy_file_range()
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).
Zbigniew Jędrzejewski-Szmek [Tue, 15 Mar 2016 23:26:30 +0000 (19:26 -0400)]
basic/missing: add copy_file_range
syscall numbers based on:
https://fedora.juszkiewicz.com.pl/syscalls.html
David Herrmann [Thu, 17 Mar 2016 15:59:46 +0000 (16:59 +0100)]
Merge pull request #2858 from keszybz/fbdev-uaccess
rules: allow users to access frame buffer devices
Daniel Mack [Thu, 17 Mar 2016 15:41:20 +0000 (16:41 +0100)]
Merge pull request #2848 from keszybz/clang-warnings
Clang warnings
Zbigniew Jędrzejewski-Szmek [Thu, 17 Mar 2016 15:16:23 +0000 (11:16 -0400)]
Merge pull request #2859 from msekletar/ldconfig-after-localfs
units: run ldconfig.service after we have mounted all local file systems
Michal Sekletar [Thu, 17 Mar 2016 13:12:32 +0000 (14:12 +0100)]
units: run ldconfig.service after we have mounted all local file systems
Also drop ConditionNeedsUpdate=|/etc. Regardless if system is updated
online or offline, updating dynamic loader cache should always be
responsibility of packaging tools/scripts.
Zbigniew Jędrzejewski-Szmek [Wed, 16 Mar 2016 13:27:37 +0000 (09:27 -0400)]
systemd: obey systemd.log_color config
Fixes #2845.
Zbigniew Jędrzejewski-Szmek [Thu, 17 Mar 2016 12:40:39 +0000 (08:40 -0400)]
rules: allow users to access frame buffer devices
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
Michal Sekletar [Wed, 16 Mar 2016 13:52:44 +0000 (14:52 +0100)]
core: look for instance when processing template name
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.
Zbigniew Jędrzejewski-Szmek [Wed, 16 Mar 2016 13:51:25 +0000 (09:51 -0400)]
Merge pull request #2855 from tklauser/master
nspawn: Fix two misspellings of "hierarchy" in error messages
Tobias Klauser [Wed, 16 Mar 2016 13:34:00 +0000 (14:34 +0100)]
nspawn: Fix two misspellings of "hierarchy" in error messages
Martin Pitt [Wed, 16 Mar 2016 09:35:30 +0000 (10:35 +0100)]
Merge pull request #2851 from eliasp/patch-1
Reference correct `machinectl` command in 219 NEWS
Elias Probst [Wed, 16 Mar 2016 08:23:31 +0000 (09:23 +0100)]
Reference correct `machinectl` command in 219 NEWS
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.
Zbigniew Jędrzejewski-Szmek [Wed, 16 Mar 2016 05:13:29 +0000 (01:13 -0400)]
Merge pull request #2797 from evverx/selinux-use-raw
selinux: use *_raw API from libselinux
Zbigniew Jędrzejewski-Szmek [Wed, 16 Mar 2016 00:21:54 +0000 (20:21 -0400)]
Merge pull request #2842 from petrosagg/nspawn-doc-fix
man: document missing KillSignal= .nspawn option
Zbigniew Jędrzejewski-Szmek [Wed, 16 Mar 2016 00:18:00 +0000 (20:18 -0400)]
Merge pull request #2843 from NetworkManager/clock_boottime
time-util: fall back to CLOCK_MONOTONIC if CLOCK_BOOTTIME unsupported
Zbigniew Jędrzejewski-Szmek [Tue, 15 Mar 2016 23:43:55 +0000 (19:43 -0400)]
Merge pull request #2847 from whot/hwdb-updates
hwdb: correct resolution for Asus x550cc
Zbigniew Jędrzejewski-Szmek [Tue, 15 Mar 2016 23:27:36 +0000 (19:27 -0400)]
basic/log: remove unused return value
Zbigniew Jędrzejewski-Szmek [Tue, 15 Mar 2016 23:27:34 +0000 (19:27 -0400)]
basic/c-rbtree: remove unused function
Zbigniew Jędrzejewski-Szmek [Tue, 15 Mar 2016 23:27:28 +0000 (19:27 -0400)]
basic/macros: clang 3.5 doesn't support alloc_size
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.
Zbigniew Jędrzejewski-Szmek [Tue, 15 Mar 2016 17:55:50 +0000 (13:55 -0400)]
test-copy: test with different max_bytes values
Petros Angelatos [Tue, 15 Mar 2016 05:18:23 +0000 (22:18 -0700)]
man: document missing KillSignal= .nspawn option
Signed-off-by: Petros Angelatos <petrosagg@gmail.com>
Peter Hutterer [Mon, 14 Mar 2016 00:03:42 +0000 (10:03 +1000)]
hwdb: correct resolution for Asus x550cc
https://bugzilla.redhat.com/show_bug.cgi?id=1316655
Zbigniew Jędrzejewski-Szmek [Tue, 15 Mar 2016 00:15:21 +0000 (20:15 -0400)]
basic/copy: use sendfile smarter
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.
Zbigniew Jędrzejewski-Szmek [Mon, 14 Mar 2016 17:18:14 +0000 (13:18 -0400)]
test-copy: add a test shuffling bytes between normal files
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.
Lubomir Rintel [Tue, 15 Mar 2016 11:43:33 +0000 (12:43 +0100)]
time-util: fall back to CLOCK_MONOTONIC if CLOCK_BOOTTIME unsupported
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.
Zbigniew Jędrzejewski-Szmek [Tue, 15 Mar 2016 04:55:08 +0000 (00:55 -0400)]
Merge pull request #2840 from linkmauve/use-xdg-config-home
sd-path: use XDG_CONFIG_HOME instead of hardcoding ~/.config for user-dirs
Emmanuel Gil Peyrot [Tue, 15 Mar 2016 01:00:34 +0000 (01:00 +0000)]
sd-path: use XDG_CONFIG_HOME instead of hardcoding ~/.config for user-dirs
Zbigniew Jędrzejewski-Szmek [Tue, 15 Mar 2016 03:51:29 +0000 (23:51 -0400)]
Merge pull request #2838 from vapier/master
include sys/sysmacros.h in more places
Mike Frysinger [Mon, 14 Mar 2016 21:44:49 +0000 (17:44 -0400)]
include sys/sysmacros.h in more places
Since glibc is moving away from implicitly including sys/sysmacros.h
all the time via sys/types.h, include the header directly in more
places. This seems to cover most makedev/major/minor usage.
Thomas Haller [Fri, 11 Mar 2016 15:18:13 +0000 (16:18 +0100)]
lldp: fix starting ttl timer for lldp neighbor
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
Daniel Mack [Mon, 14 Mar 2016 15:55:04 +0000 (16:55 +0100)]
Merge pull request #2827 from keszybz/public-headers
ANSI C compatibility for public headers
Zbigniew Jędrzejewski-Szmek [Mon, 14 Mar 2016 13:12:29 +0000 (09:12 -0400)]
Merge pull request #2735 from evverx/fix-2730
Add test for -.mount with Alias=root.mount, bug #2730.
Zbigniew Jędrzejewski-Szmek [Mon, 14 Mar 2016 12:23:52 +0000 (08:23 -0400)]
Merge pull request #2834 from coling/master
Zbigniew Jędrzejewski-Szmek [Mon, 14 Mar 2016 12:14:41 +0000 (08:14 -0400)]
Merge pull request #2832 from evverx/fix-mkfs-btrfs-checking
Fix mkfs.btrfs checking
Zbigniew Jędrzejewski-Szmek [Mon, 14 Mar 2016 11:47:01 +0000 (07:47 -0400)]
Merge pull request #2835 from tklauser/man-spelling
man: network - Fix misspelling of "router advertisement"
Tobias Klauser [Mon, 14 Mar 2016 11:13:58 +0000 (12:13 +0100)]
man: network - Fix misspelling of "router advertisement"
Colin Guthrie [Mon, 14 Mar 2016 09:42:07 +0000 (09:42 +0000)]
device: Ensure we have sysfs path before comparing.
In some cases we do not have a udev device when setting up a unit
(certainly the code gracefully handles this). However, we do
then go on to compare the path via path_equal which will assert
if a null value is passed in.
See https://bugs.mageia.org/show_bug.cgi?id=17766
Not sure if this is the correct fix, but it avoids the crash
Evgeny Vereshchagin [Mon, 14 Mar 2016 00:54:35 +0000 (00:54 +0000)]
shared/machine-pool: fix another mkfs.btrfs checking
Fixes:
Message: Process 806 (systemd-importd) of user 0 dumped core.
Stack trace of thread 806:
#0 0x00007f5eaeff7227 raise (libc.so.6)
#1 0x00007f5eaeff8e8a abort (libc.so.6)
#2 0x000055b6d3418f4f log_assert_failed (systemd-importd)
#3 0x000055b6d3409daf safe_close (systemd-importd)
#4 0x000055b6d33c25ea closep (systemd-importd)
#5 0x000055b6d33c38d9 setup_machine_directory (systemd-importd)
#6 0x000055b6d33b8536 method_pull_tar_or_raw (systemd-importd)
#7 0x000055b6d33ed097 method_callbacks_run (systemd-importd)
#8 0x000055b6d33ef929 object_find_and_run (systemd-importd)
#9 0x000055b6d33eff6b bus_process_object (systemd-importd)
#10 0x000055b6d3447f77 process_message (systemd-importd)
#11 0x000055b6d344815a process_running (systemd-importd)
#12 0x000055b6d3448a10 bus_process_internal (systemd-importd)
#13 0x000055b6d3448ae1 sd_bus_process (systemd-importd)
#14 0x000055b6d3449779 time_callback (systemd-importd)
#15 0x000055b6d3454ff4 source_dispatch (systemd-importd)
#16 0x000055b6d34562b9 sd_event_dispatch (systemd-importd)
#17 0x000055b6d34566f8 sd_event_run (systemd-importd)
#18 0x000055b6d33ba72a bus_event_loop_with_idle (systemd-importd)
#19 0x000055b6d33b95bc manager_run (systemd-importd)
#20 0x000055b6d33b9766 main (systemd-importd)
#21 0x00007f5eaefe2a00 __libc_start_main (libc.so.6)
#22 0x000055b6d33b5569 _start (systemd-importd)
Evgeny Vereshchagin [Sun, 13 Mar 2016 23:51:37 +0000 (23:51 +0000)]
shared/machine-pool: fix mkfs.btrfs checking
binary_is_good translates ENOENT to 0
See https://github.com/systemd/systemd/commit/
85eca92e#diff-bcad68c477b6651521e880c40b7a9b40R813
Ronny Chevalier [Sat, 12 Mar 2016 14:56:54 +0000 (15:56 +0100)]
Merge pull request #2828 from mineo/run-help
run: Improve the help message about timer options and existing units
Wieland Hoffmann [Sat, 12 Mar 2016 10:50:34 +0000 (11:50 +0100)]
run: Improve the help message about timer options and existing units
Zbigniew Jędrzejewski-Szmek [Fri, 11 Mar 2016 18:50:56 +0000 (13:50 -0500)]
headers: remove commas at end of enum lists
src/systemd/sd-journal.h:75:51: warning: commas at the end of enumerator
lists are a C99-specific feature [-Wc99-extensions]
Zbigniew Jędrzejewski-Szmek [Fri, 11 Mar 2016 18:46:12 +0000 (13:46 -0500)]
headers: do not use siginfo_t if not defined
Simply avoid the trouble and use a void* if the define
is missing. We lose type safety, but who cares.
sigaction(2) says that siginfo_t requires _POSIX_C_SOURCE >= 199309L,
but we can be a bit more generous and use the same define
as /usr/include/signal.h.
Zbigniew Jędrzejewski-Szmek [Fri, 11 Mar 2016 18:41:49 +0000 (13:41 -0500)]
headers: use __inline__ instead of inline
https://gcc.gnu.org/onlinedocs/gcc-5.3.0/gcc/Alternate-Keywords.html#Alternate-Keywords
recommends __inline__ over inline in ANSI C compatible headers.
Tested with gcc-5.3 and clang-3.7.
https://bugzilla.redhat.com/show_bug.cgi?id=1316964
Zbigniew Jędrzejewski-Szmek [Fri, 11 Mar 2016 18:33:43 +0000 (13:33 -0500)]
build-sys: add check that our headers are ANSI compatible