summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-12-17Merge branch 'notsystemd/postmove' into notsystemd/masterLuke Shumaker
# Conflicts: # src/grp-journal/libjournal-core/.gitignore # src/grp-system/libcore/include/core/mount.h
2016-12-17Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2016-12-17./tools/notsd-moveLuke Shumaker
2016-12-17update notsd-moveLuke Shumaker
2016-12-17Merge branch 'systemd/parabola' into notsystemd/premoveLuke Shumaker
# Conflicts: # Makefile.amp
2016-12-17Merge commit '0064dcc0fc1c6519d54c5a104990c1db94f19ddf' into notsystemd/premoveLuke Shumaker
# Conflicts: # system-preset/90-systemd.preset
2016-12-17Merge commit '58a6dd15582c038a25bd7059435833943e2e4617' into notsystemd/premoveLuke Shumaker
# Conflicts: # Makefile.am # src/boot/bootctl.c # system-preset/90-systemd.preset
2016-12-17Merge tag 'systemd/v232-6.parabola1' into systemd/parabolaLuke Shumaker
2016-12-17# Rename "Linux Boot Manager" -> "Systemd Boot Manager"systemd/v232-6.parabola1Luke Shumaker
sed -i 's|Linux Boot Manager|Systemd Boot Manager|' src/boot/bootctl.c
2016-12-17FSDG: man/: Use FSDG operating systems as examples.Luke Shumaker
2016-12-17FSDG: systemd-resolved: Default to hostname "gnu-linux" instead of "linux"Luke Shumaker
2016-12-17FSDG: os-release: Default ID to "gnu-linux" instead of "linux".Luke Shumaker
As far as I can tell, no code in this repository actually uses the ID field, so this is just a man page change.
2016-12-17FSDG: os-release: Default to NAME "GNU/Linux" instead of "Linux".Luke Shumaker
2016-12-17FSDG: os-release: Default to PRETTY_NAME "GNU/Linux" instead of "Linux".Luke Shumaker
2016-12-17FSDG: man/: Refer to the operating system as GNU/Linux.Luke Shumaker
This is not a blind replacement of "Linux" with "GNU/Linux". In some cases, "Linux" is (correctly) used to refer to just the kernel. In others, it is in a string for which code must also be adjusted; these instances are not included in this commit.
2016-12-17Merge tag 'systemd/v232-4'systemd/v232-6Luke Shumaker
2016-12-17nspawn: don't hide --bind=/tmp/* mountsDave Reisner
This is a v232-applicable version of upstream c9fd987279a462e.
2016-12-17build-sys: check for lz4 in the old and new numbering scheme (#4717)Zbigniew Jędrzejewski-Szmek
lz4 upstream decided to switch to an incompatible numbering scheme (1.7.3 follows 131, to match the so version). PKG_CHECK_MODULES does not allow two version matches for the same package, so e.g. lz4 < 10 || lz4 >= 125 cannot be used. Check twice, once for "new" numbers (anything below 10 is assume to be new), once for the "old" numbers (anything above >= 125). This assumes that the "new" versioning will not get to 10 to quickly. I think that's a safe assumption, lz4 is a mature project. Fixed #4690.
2016-12-17journal: make sure to initially populate the space info cache (#4807)Franck Bui
Make sure to populate the cache in cache_space_refresh() at least once otherwise it's possible that the system boots fast enough (and the journal flush service is finished) before the invalidate cache timeout (30 us) has expired. Fixes: #4790
2016-12-17nspawn: fix exit code for --help and --version (#4609)Martin Pitt
Commit b006762 inverted the initial exit code which is relevant for --help and --version without a particular reason. For these special options, parse_argv() returns 0 so that our main() immediately skips to the end without adjusting "ret". Otherwise, if an actual container is being started, ret is set on error in run(), which still provides the "non-zero exit on error" behaviour. Fixes #4605.
2016-12-17Merge tag 'systemd/v232-4.parabola1' into systemd/parabolaLuke Shumaker
2016-12-17# Rename "Linux Boot Manager" -> "Systemd Boot Manager"systemd/v232-4.parabola1Luke Shumaker
sed -i 's|Linux Boot Manager|Systemd Boot Manager|' src/boot/bootctl.c
2016-12-17FSDG: man/: Use FSDG operating systems as examples.Luke Shumaker
2016-12-17FSDG: systemd-resolved: Default to hostname "gnu-linux" instead of "linux"Luke Shumaker
2016-12-17FSDG: os-release: Default ID to "gnu-linux" instead of "linux".Luke Shumaker
As far as I can tell, no code in this repository actually uses the ID field, so this is just a man page change.
2016-12-17FSDG: os-release: Default to NAME "GNU/Linux" instead of "Linux".Luke Shumaker
2016-12-17FSDG: os-release: Default to PRETTY_NAME "GNU/Linux" instead of "Linux".Luke Shumaker
2016-12-17FSDG: man/: Refer to the operating system as GNU/Linux.Luke Shumaker
This is not a blind replacement of "Linux" with "GNU/Linux". In some cases, "Linux" is (correctly) used to refer to just the kernel. In others, it is in a string for which code must also be adjusted; these instances are not included in this commit.
2016-12-17Revert "nspawn: try to bind mount resolved's resolv.conf snippet into the ↵systemd/v232-4Dave Reisner
container" This reverts commit 3539724c26a1b2b00c4eb3c004b635a4b8647de6.
2016-12-17disable RestrictAddressFamilies on i686Dave Reisner
Shit's broke, yo. https://github.com/systemd/systemd/issues/4575
2016-12-17device: Avoid calling unit_free(NULL) in device setup logic (#4748)Dave Reisner
Since a581e45ae8f9bb5c, there's a few function calls to unit_new_for_name which will unit_free on failure. Prior to this commit, a failure would result in calling unit_free with a NULL unit, and hit an assertion failure, seen at least via device_setup_unit: Assertion 'u' failed at src/core/unit.c:519, function unit_free(). Aborting. Fixes #4747 https://bugs.archlinux.org/task/51950
2016-12-17build-sys: do not install ctrl-alt-del.target symlink twiceZbigniew Jędrzejewski-Szmek
It was a harmless but pointless duplication. Fixes #4655. Note: in general we try to install as little as possible in /etc/systemd/{system,user}. We only install .wants links there for units which are "user configurable", i.e. which have an [Install] section. Most our units and aliases are not user configurable, do not have an [Install] section, and must be symlinked statically during installation. A few units do have an [Install] section, and are enabled through symlinks in /etc/ during installation using GENERAL_ALIASES. It *would* be possible to not create those symlinks, and instead require 'systemctl preset' to be invoked after installation, but GENERAL_ALIASES works well enough.
2016-12-17basic/virt: fix userns check on CONFIG_USER_NS=n kernel (#4651)Zbigniew Jędrzejewski-Szmek
ENOENT should be treated as "false", but because of the broken errno check it was treated as an error. So ConditionVirtualization=user-namespaces probably returned the correct answer, but only by accident. Fixes #4608.
2016-12-17core: don't use the unified hierarchy for the systemd cgroup yet (#4628)Martin Pitt
Too many things don't get along with the unified hierarchy yet: * https://github.com/opencontainers/runc/issues/1175 * https://github.com/docker/docker/issues/28109 * https://github.com/lxc/lxc/issues/1280 So revert the default to the legacy hierarchy for now. Developers of the above software can opt into the unified hierarchy with "systemd.legacy_systemd_cgroup_controller=0".
2016-11-29Merge branch 'notsystemd/postmove' into notsystemd/masterLuke Shumaker
2016-11-29Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2016-11-29./tools/notsd-moveLuke Shumaker
2016-11-29Makefile.am: udev.confLuke Shumaker
2016-11-29Merge branch 'notsystemd/postmove' into notsystemd/masterLuke Shumaker
2016-11-29Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2016-11-29./tools/notsd-moveLuke Shumaker
2016-11-29oopsLuke Shumaker
2016-11-29Merge branch 'notsystemd/postmove' into notsystemd/masterLuke Shumaker
2016-11-29Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2016-11-29./tools/notsd-moveLuke Shumaker
2016-11-29split Makefile.am a bit moreLuke Shumaker
2016-11-29fix thingsLuke Shumaker
2016-11-03Revert "sd-bus: use PRIu64 instead of casting" (#4556)systemd/v232Zbigniew Jędrzejewski-Szmek
This reverts commit 75ead2b753cb9586f3f208326446081baab70da1. Follow up for #4546: > @@ -848,8 +848,7 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { if (k->src_id == KDBUS_SRC_ID_KERNEL) bus_message_set_sender_driver(bus, m); else { - xsprintf(m->sender_buffer, ":1.%llu", - (unsigned long long)k->src_id); + xsprintf(m->sender_buffer, ":1.%"PRIu64, k->src_id); This produces: src/libsystemd/sd-bus/bus-kernel.c: In function ‘bus_kernel_make_message’: src/libsystemd/sd-bus/bus-kernel.c:851:44: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 4 has type ‘__u64 {aka long long unsigned int}’ [-Wformat=] xsprintf(m->sender_buffer, ":1.%"PRIu64, k->src_id); ^
2016-11-03hwdb update for 232 (#4557)Lennart Poettering
2016-11-03final NEWS update for 232 (#4558)Lennart Poettering
let's get this out today!