1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-24 21:34:08 +03:00
Commit Graph

20945 Commits

Author SHA1 Message Date
Daniel Mack
06528e8fdd build-sys: bring back an intltool-update workaround
Currently, 'make distcheck' fails with an error such as this:

    srcdir=../../po /usr/bin/intltool-update -m
    The following files contain translations and are currently not in use.
    Please consider adding these to the POTFILES.in file, located in the po/ directory.

    build2/src/core/org.freedesktop.systemd1.policy.in
    build3/src/core/org.freedesktop.systemd1.policy.in

    [...]

This is caused by a new behavior of autmake 1.15 which changed the
location of the build tree during 'make distcheck', and the fact that
intltool doesn't yet ignore that paths.

We used to have a workaround in configure.ac that makes the failing call
a no-op, but it was accidentially removed in 23756070
("remove gudev and gtk-doc").

Bring back that snipet for now, until intltool and automake sorted out
their issues and like each other again.

Also see

  https://bugs.launchpad.net/intltool/+bug/1117944
2015-06-19 10:58:49 +02:00
Ronny Chevalier
cf4d75ccf9 Merge pull request #297 from ssahani/net
networkd: vlan improve logging
2015-06-19 10:24:13 +02:00
Susant Sahani
0a07970ead networkd: vlan improve logging
Replaces strerror() usage with log_netdev_error_errno()
2015-06-19 12:03:38 +05:30
Lennart Poettering
a2088fd025 update TODO 2015-06-19 01:12:54 +02:00
Lennart Poettering
b912e25181 NEWS: update contributors list and date 2015-06-19 01:12:28 +02:00
Kay Sievers
6433d44072 Merge pull request #293 from teg/man-revert
man: revert dynamic paths for split-usr setups
2015-06-18 22:27:50 +02:00
David Herrmann
38489ef8b2 Merge pull request #294 from teg/hashmap-debug-locking-2
hashmap: debug - lock access to the global hashmap list
2015-06-18 22:05:09 +02:00
David Herrmann
7324b6e4ef Merge pull request #292 from teg/man-udev-2
man: udev_device - finish new_* man page
2015-06-18 21:42:08 +02:00
David Herrmann
ea0707c661 Merge pull request #291 from poettering/nspawn-suppress-eloop
nspawn: suppress warning when /etc/resolv.conf is a valid symlink
2015-06-18 21:38:09 +02:00
Tom Gundersen
4f1b306169 hashmap: debug - lock access to the global hashmap list
This may be used from multi-threaded programs (say through nss-resolve),
so we must protect the global list.

This is still only relevant for debug builds, so we do not try to handle
cases where the locking fail, but simply assert.
2015-06-18 21:35:18 +02:00
Lennart Poettering
c874ef05a7 update TODO 2015-06-18 20:08:01 +02:00
Lennart Poettering
affb71da79 update TODO 2015-06-18 20:03:11 +02:00
Tom Gundersen
12b42c7667 man: revert dynamic paths for split-usr setups
This did not really work out as we had hoped. Trying to do this upstream
introduced several problems that probably makes it better suited as a
downstream patch after all. At any rate, it is not releaseable in the
current state, so we at least need to revert this before the release.

 * by adjusting the path to binaries, but not do the same thing to the
   search path we end up with inconsistent man-pages. Adjusting the search
   path too would be quite messy, and it is not at all obvious that this is
   worth the effort, but at any rate it would have to be done before we
   could ship this.

 * this means that distributed man-pages does not make sense as they depend
   on config options, and for better or worse we are still distributing
   man pages, so that is something that definitely needs sorting out before
   we could ship with this patch.

 * we have long held that split-usr is only minimally supported in order
   to boot, and something we hope will eventually go away. So before we start
   adding even more magic/effort in order to make this work nicely, we should
   probably question if it makes sense at all.
2015-06-18 19:47:44 +02:00
Lennart Poettering
68a313c592 nspawn: suppress warning when /etc/resolv.conf is a valid symlink
In such a case let's suppress the warning (downgrade to LOG_DEBUG),
under the assumption that the user has no config file to update in its
place, but a symlink that points to something like resolved's
automatically managed resolve.conf file.

While we are at it, also stop complaining if we cannot write /etc/resolv.conf
due to a read-only disk, given that there's little we could do about it.
2015-06-18 19:45:18 +02:00
Lennart Poettering
ff609b8ecd update TODO 2015-06-18 19:45:06 +02:00
Tom Gundersen
2ef24a16ac man: udev_device - finish new_* man page
A description of device_id lacked. We still need to do the other
udev_device_* man pages.
2015-06-18 19:18:33 +02:00
Lennart Poettering
74b1f52763 Merge pull request #288 from phomes/cgroup-util
cgroup-util: actually use the path callback
2015-06-18 18:57:16 +02:00
Tom Gundersen
013e5e7ddf Merge pull request #285 from poettering/audit-table-fix
Audit table fix
2015-06-18 18:38:40 +02:00
Lennart Poettering
26d5692e32 Merge pull request #286 from jsynacek/fix-edit-v3
systemctl: fix edit when EDITOR contains arguments
2015-06-18 18:30:31 +02:00
Lennart Poettering
39765e5f92 Merge pull request #289 from michich/hashmap-small-cleanup
a tiny hashmap cleanup
2015-06-18 18:29:11 +02:00
Thomas Hindoe Paaboel Andersen
edf5b3b869 cgroup-util: actually use the path callback
We allow to specify a callback but then ignore the result. Looks like a trivial typo.
From 7b3fd6313c4b07b6f822a9f979d0c22350a401d9#diff-f010fa21ba7b659b519c122743e55604
2015-06-18 17:39:34 +02:00
Lennart Poettering
478b6f86a6 Merge pull request #287 from phomes/master
NEWS: typo fixes
2015-06-18 17:22:59 +02:00
Thomas Hindoe Paaboel Andersen
0aee49d5fb NEWS: typo fixes 2015-06-18 17:10:59 +02:00
Ronny Chevalier
c655146496 NEWS: fix typo 2015-06-18 16:23:28 +02:00
Daniel Mack
5617dde9ac Merge pull request #282 from martinpitt/master
Fix out-of-tree builds and distcheck
2015-06-18 16:01:58 +02:00
Jan Synacek
9ef5d8f2cb systemctl: fix edit when EDITOR contains arguments
Correctly support cases when the EDITOR environment variable and friends
also contain arguments. For example, to run emacs in terminal only, one
can say:

EDITOR="emacs -nw" systemctl edit myservice
2015-06-18 13:46:08 +02:00
Lennart Poettering
07ba233e9e audit: make sure to include libaudit-defined audit events in table
This change hooks up $(audit_list_includes) that was already
defined since the beginning of the audit type list, but never actually
made use of.

It thus completes 4733607eec.
2015-06-18 13:41:09 +02:00
Lennart Poettering
eedb4ac831 update TODO 2015-06-18 13:32:24 +02:00
Lennart Poettering
e063e03404 Merge pull request #247 from shaded-enmity/origin/pullfix
import/pull: fix for the name/reference overwrite
2015-06-18 13:02:57 +02:00
Pavel Odvody
4764a54439 import/pull: fix pulling by image digest
When pulling by image digest the identifiers that
were produced by parsing image digest were later
overwritten by code parsing image tag.
This resulted in invalid identifiers being used
when contacting the remote endpoint, resulting in 404.

Reported here:
http://lists.freedesktop.org/archives/systemd-devel/2015-June/033039.html
2015-06-18 12:04:30 +02:00
David Herrmann
fd23f9c9a7 test: disable test-barrier by default
The test-barrier binary uses real-time alarms and timeouts to test for
races in the thread-barrier implementation. Hence, if your system is under
high load and your scheduler decides to not run test-barrier for
>BASE_TIME, then the tests are likely to fail.

Two options:
 1) Increase BASE_TIME. This will make the test take significantly longer
    for no real good. Furthermore, it is still not guaranteed that the
    task is scheduled.
 2) Don't rely on real-time timers, but use explicit synchronization. This
    would basically test one barrier implementation with another.. kinda
    ironic.. but maybe something worth looking into.
 3) Disable test-barrier by default.

This patch chooses option 3) and makes sure test-barrier only runs if you
pass any argument.

Side note:
        test-barrier is written in a way that if it fails under load, but
        does not on idle systems, then it is very _unlikely_ that the
        barrier implementation is the culprit. Hence, it makes little
        sense to run it under load, anyway. It will not improve the test
        coverage of barrier.c, but rather the coverage of the test itself.
2015-06-18 10:25:08 +02:00
Daniel Mack
575ee5e4f7 Merge pull request #281 from michaelolbrich/glibc-2.16-fix
exit-status: add missing include for SIG* defines
2015-06-18 10:18:28 +02:00
Martin Pitt
65d21ff344 build-sys: don't dist man/systemd.directives.xml
It depends on man/custom-entities.ent which is (and needs to be) a built file,
so we need to always build man/systemd.directives.xml as well.

We also need to drop this from update-man-list so that it doesn't get disted
from Makefile-man.am.

Fixes distcheck failure.

https://github.com/systemd/systemd/issues/215
2015-06-18 09:51:37 +02:00
Michael Olbrich
c43516e075 exit-status: add missing include for SIG* defines
Otherwise building fails with glibc 2.16. It works with glibc >= 2.17
because it is implicitly included via macro.h -> sys/param.h -> signal.h
2015-06-18 09:04:43 +02:00
Daniel Mack
4584eaea92 build-sys: make SOURCE_XML_FILES array relative to $(top_srcdir)
When calling the build commands from another directory than the toplevel:

  mkdir build
  cd build
  ../configure [...]

... the compilation fails with the following error:

 GEN      man/systemd.directives.xml
Traceback (most recent call last):
  File "../tools/make-directive-index.py", line 313, in make_page
    _extract_directives(directive_groups, formatting, page)
  File "../tools/make-directive-index.py", line 191, in _extract_directives
    t = xml_parse(page)
  File "/home/martin/upstream/systemd/tools/xml_helper.py", line 30, in xml_parse
    doc = tree.parse(page, _parser)
  File "lxml.etree.pyx", line 3301, in lxml.etree.parse (src/lxml/lxml.etree.c:72453)
  File "parser.pxi", line 1791, in lxml.etree._parseDocument (src/lxml/lxml.etree.c:105915)
  File "parser.pxi", line 1817, in lxml.etree._parseDocumentFromURL (src/lxml/lxml.etree.c:106214)
  File "parser.pxi", line 1721, in lxml.etree._parseDocFromFile (src/lxml/lxml.etree.c:105213)
  File "parser.pxi", line 1122, in lxml.etree._BaseParser._parseDocFromFile (src/lxml/lxml.etree.c:100163)
  File "parser.pxi", line 580, in lxml.etree._ParserContext._handleParseResultDoc (src/lxml/lxml.etree.c:94286)
  File "parser.pxi", line 690, in lxml.etree._handleParseResult (src/lxml/lxml.etree.c:95722)
  File "parser.pxi", line 618, in lxml.etree._raiseParseError (src/lxml/lxml.etree.c:94754)
OSError: Error reading file 'man/bootup.xml': failed to load external entity "man/bootup.xml"

That is because the file names in the XML_FILES array are not relative
to $(top_srcdir), and hence ../tools/make-directive-index.py is called
with non-existant arguments.

To fix this, call patsubst when generating SOURCE_XML_FILES from
NON_INDEX_XML_FILES.
2015-06-18 08:20:03 +02:00
Kay Sievers
b34503a7fd Merge pull request #269 from teg/udev-docs-1
man: libudev - add description to udev_device_*
2015-06-18 00:45:51 +02:00
Daniel Mack
867a99b406 Merge pull request #272 from poettering/nspawn-flush-copy-fd
nspawn: when exiting, flush all remaining bytes from the pty to stdout
2015-06-18 00:34:22 +02:00
Lennart Poettering
561471314c build-sys: bump versions and sonames 2015-06-18 00:28:41 +02:00
Kay Sievers
bcf1097553 Merge pull request #276 from poettering/dbus-search-path
bus-proxy: add new dbus policy search paths from /usr
2015-06-18 00:26:46 +02:00
Kay Sievers
5f92d24fa8 NEWS: update 2015-06-18 00:25:43 +02:00
Lennart Poettering
422c759f3f Merge pull request #277 from poettering/journal-interleaving-monotonic
journal: make sure the clock increases strict monotonic
2015-06-18 00:22:22 +02:00
Lennart Poettering
470e72d408 NEWS: prepare for v221 2015-06-18 00:18:49 +02:00
Lennart Poettering
bd4c12ef02 hwdb: update databases from upstream 2015-06-17 23:54:35 +02:00
Lennart Poettering
7128df76f0 man: minor typo fix 2015-06-17 23:50:13 +02:00
Lennart Poettering
1047e12dc1 man: run make update-man-list 2015-06-17 23:50:02 +02:00
Tom Gundersen
7663da324a Merge pull request #270 from phomes/master
udevd: remove dead code
2015-06-17 23:27:39 +02:00
Lennart Poettering
44cf96e33e journal: make sure the clock increases strict monotonic
Let's work around crappy clocks in test-journal-interleaving.c too. This
does the same as 98d2a53417 but for
test-journal-interlaving.c rather than test-journal-stream.c.
2015-06-17 23:26:39 +02:00
Martin Pitt
921ee38ff6 Merge pull request #275 from poettering/acl-fixes
acl-util: various smaller fixes to parse_acl()
2015-06-17 23:10:19 +02:00
Lennart Poettering
de587378ea update TODO 2015-06-17 23:03:27 +02:00
Lennart Poettering
30654aa0d4 Merge pull request #271 from poettering/test-journal-stream-crappy-clock
journal: ensure test-journal-stream doesn't get confused by crappy cl…
2015-06-17 22:56:09 +02:00