]> git.ipfire.org Git - thirdparty/systemd.git/log
thirdparty/systemd.git
3 years agoMerge pull request #19611 from yuwata/network-dhcp-server-introduce-server-address
Yu Watanabe [Wed, 19 May 2021 01:29:43 +0000 (10:29 +0900)] 
Merge pull request #19611 from yuwata/network-dhcp-server-introduce-server-address

network: dhcp-server: introduce ServerAddress= setting

3 years agoMerge pull request #19631 from yuwata/network-fix-reference-counting-issues
Yu Watanabe [Wed, 19 May 2021 01:29:16 +0000 (10:29 +0900)] 
Merge pull request #19631 from yuwata/network-fix-reference-counting-issues

network: fix reference counting issues

3 years agoMerge pull request #19630 from keszybz/jinja2
Yu Watanabe [Wed, 19 May 2021 01:27:21 +0000 (10:27 +0900)] 
Merge pull request #19630 from keszybz/jinja2

Use jinja2 for templating

3 years agodocs/HACKING: add note about template engines 19630/head
Zbigniew Jędrzejewski-Szmek [Mon, 17 May 2021 19:32:49 +0000 (21:32 +0200)] 
docs/HACKING: add note about template engines

3 years agomeson: add workaround for old meson
Zbigniew Jędrzejewski-Szmek [Mon, 17 May 2021 10:42:34 +0000 (12:42 +0200)] 
meson: add workaround for old meson

Recent meson versions include the directory name in the target name,
so there is no conflict for files with the same name in different
directories. But at least with meson-0.49.2 in buster we have conflict
with sysusers.d/systemd.conf.

3 years agoci: drop py2 lxml, pull in jinja2
Zbigniew Jędrzejewski-Szmek [Mon, 17 May 2021 08:36:30 +0000 (10:36 +0200)] 
ci: drop py2 lxml, pull in jinja2

3 years agounits: generate ReadWritePaths= in the template
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 18:13:14 +0000 (20:13 +0200)] 
units: generate ReadWritePaths= in the template

3 years agomeson: sort conf paths alphabetically
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 17:34:52 +0000 (19:34 +0200)] 
meson: sort conf paths alphabetically

The order was a complete mess. Let's make it a bit more tidy.

3 years agoman: use readable names for entities
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 16:54:04 +0000 (18:54 +0200)] 
man: use readable names for entities

Let's use the same names as in the jinja2 substitutions.

3 years agomeson: drop "_YES_NO" variables
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 16:49:04 +0000 (18:49 +0200)] 
meson: drop "_YES_NO" variables

We can generate the right string in the template directly.

3 years agomeson: use jinja2 also for custom-entities.ent
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 16:46:59 +0000 (18:46 +0200)] 
meson: use jinja2 also for custom-entities.ent

This doesn't matter too much, but makes things a bit more consistent.
A minor advantage is that the file is not a configuration file for meson
anymore, so:
 a) It is not built unless pulled in by another target. Since
    we don't usually build man pages by default, this saves a tiny
    amount of work.
 b) When the .in file is updated, meson does not reconfigure everything,
    but just rebuilds the dependent targets.

Now that the conversion is finished, time for benchmarking:
a full build with default settings (and -Dstandalonebinaries=true), yields

before this pull request: 1687 targets, 148.13s user 35.17s system 317% cpu 57.697 total
with the full pull request: 1714 targets, 143.07s user 27.87s system 314% cpu 54.369 total

The difference doesn't seem significant. Partial rebuilds might be faster as
mentioned before.

3 years agomeson: drop "substs"
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 16:36:44 +0000 (18:36 +0200)] 
meson: drop "substs"

We had two big 'configuration_data' objects in meson config. (There are in fact
more. On is added in this series, and there's one for efi… But those others
have a handful variables only for specific purposes and don't matter). The two
sets are 'conf' and 'substs', and were inherited from the original autotools
system. In the past there was even a third set ('m4_defines'), but @yuwata
removed it in 348b44372f36010d48d9a7dda14ef67155753a71. And those two/three
systems had very similar data, but with different variable names, because of
historical reasons. They also used subtly different quoting (.set()
vs. .set10() vs. .set_quoted()), which was required because the templating
engines were not flexible enough. This meants we had more work when changing
things, and we needed to search for different variable names, etc.

With a more flexible templating engine we can do with just one
configuration_data object.

3 years agomeson: use jinja2 in shell-completion/
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 16:34:23 +0000 (18:34 +0200)] 
meson: use jinja2 in shell-completion/

3 years agoefi: use meson object directly instead of going through 'substs'
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 16:06:33 +0000 (18:06 +0200)] 
efi: use meson object directly instead of going through 'substs'

3 years agomeson: use jinja2 in src/journal-remote
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 16:03:23 +0000 (18:03 +0200)] 
meson: use jinja2 in src/journal-remote

One stanza had "if install_sysconfdir_samples", while the other
"if install_sysconfdir", which looks like a mistake.
install_sysconfdir_samples is now used for both.

3 years agomeson: use jinja2 in src/libsystemd/
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 15:56:15 +0000 (17:56 +0200)] 
meson: use jinja2 in src/libsystemd/

3 years agomeson: use jinja2 for various files in src/core/
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 15:52:42 +0000 (17:52 +0200)] 
meson: use jinja2 for various files in src/core/

3 years agomeson: use jinja2 for src/libudev/
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 15:33:48 +0000 (17:33 +0200)] 
meson: use jinja2 for src/libudev/

3 years agomeson: use jinja2 for src/resolve/
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 14:55:16 +0000 (16:55 +0200)] 
meson: use jinja2 for src/resolve/

3 years agomeson: use jinja2 for rpm templates
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 14:44:47 +0000 (16:44 +0200)] 
meson: use jinja2 for rpm templates

The naming of variables is very inconsistent. I tried to use more
modern style naming (UNDERSCORED_TITLE_CASE), but I didn't change existing
names too much. Only SYSTEM_DATA_UNIT_PATH is renamed to SYSTEM_DATA_UNIT_DIR
to match SYSTEM_CONFIG_UNIT_DIR.

3 years agorpm: use %_bindir not @bindir@
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 14:45:51 +0000 (16:45 +0200)] 
rpm: use %_bindir not @bindir@

We were using both in various places. To keep things simple, let
rpm do the substitution.

3 years agomeson: use jinja2 in src/timesync/
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 14:11:04 +0000 (16:11 +0200)] 
meson: use jinja2 in src/timesync/

3 years agomeson: use jinja2 in src/udev
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 14:07:19 +0000 (16:07 +0200)] 
meson: use jinja2 in src/udev

3 years agomeson: use jinja2 in src/vconsole
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 14:04:04 +0000 (16:04 +0200)] 
meson: use jinja2 in src/vconsole

3 years agomeson: use jinja2 in sysctl.d/
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 14:01:24 +0000 (16:01 +0200)] 
meson: use jinja2 in sysctl.d/

3 years agomeson: use conf configuration_data object to generate test-sysusers.sh
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 13:57:55 +0000 (15:57 +0200)] 
meson: use conf configuration_data object to generate test-sysusers.sh

I wanted to use jinja2 templating here too, but it's hard to get right:
custom_target() strips the executable bit by default (unlike configure_file
apparently). custom_target() has install_mode setting, but it was only added
in meson-0.47, so it can't be used while we support 0.46. And without the
executable bit the test is not invoked properly. For example, "root-unittests"
in the debian package calls test-* after installation, so the executable bit
there is necessary. It would be possible to adjust the file mode after the
fact, but it would make things more complicated.

So let's use the native meson substitutions here. We don't need anything more
fancy.

3 years agomeson: use jinja2 for rules.d templates
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 13:51:17 +0000 (15:51 +0200)] 
meson: use jinja2 for rules.d templates

3 years agomeson: use custom configuration_data() object for man/man and man/html helpers
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 13:43:41 +0000 (15:43 +0200)] 
meson: use custom configuration_data() object for man/man and man/html helpers

I want to stop using 'substs'. But in this case, configure_file() is nicer
than custom_target(), because it causes meson to immediately generate the
helpers after configuration, so it's possible to do
'meson build && build/man/man ...', without building anything first.

We only substitute one variable here, so let's use a custom configuration_data()
object.

3 years agoDrop dependency on m4
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 13:20:46 +0000 (15:20 +0200)] 
Drop dependency on m4

m4 was hugely popular in the past, because autotools, automake, flex, bison and
many other things used it. But nowadays it much less popular, and might not even
be installed in the buildroot. (m4 is small, so it doesn't make a big difference.)

(FWIW, Fedora dropped make from the buildroot now,
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot. I think it's
reasonable to assume that m4 will be dropped at some point too.)

The main reason to drop m4 is that the syntax is not very nice, and we should
minimize the number of different syntaxes that we use. We still have two
(configure_file() with @FOO@ and jinja2 templates with {{foo}} and the
pythonesque conditional expressions), but at least we don't need m4 (with
m4_dnl and `quotes').

3 years agomeson: use jinja2 for README
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 13:05:10 +0000 (15:05 +0200)] 
meson: use jinja2 for README

3 years agomeson: use jinja2 for the gperf template
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 12:55:43 +0000 (14:55 +0200)] 
meson: use jinja2 for the gperf template

Jinja2 inserts an empty line after the first macro body, which I don't know how
to get rid of. Only the first macro causes problems: the other ones don't have
conditional statements at the end and the issue does not occur. As a work-around
I moved ProtectHostname to the end of the first macro.

Output is identical, except for horizontal whitespace and change in position of
ProtectHostname.

3 years agomeson: use jinja2 for src/login
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 11:57:00 +0000 (13:57 +0200)] 
meson: use jinja2 for src/login

{% raw %} is needed to avoid trouble with {%k, which jinja thinks
is trying to access variable 'k'.

3 years agomeson: use jinja2 for tmpfiles.d templates
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 11:35:51 +0000 (13:35 +0200)] 
meson: use jinja2 for tmpfiles.d templates

HAVE_SMACK_RUN_LABEL was dropped back in 348b44372f36010d48d9a7dda14ef67155753a71,
so one line in etc.conf was not rendered as expected ;(
Checking if names are defined is paying for itself!

3 years agomeson: drop unnecessary listification
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 11:02:04 +0000 (13:02 +0200)] 
meson: drop unnecessary listification

3 years agounits: strip out the developer comment in .service unit again
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 17:08:50 +0000 (19:08 +0200)] 
units: strip out the developer comment in .service unit again

The comment talks about upstream development steps and doesn't make
sense for users. We used special '## ' syntax to strip it out during
build, but it got inadvertently reformatted as a normal comment
in 3982becc92197b920d86f03c3c52ae085e26ca60.

3 years agomeson: use jinja2 for unit templates
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 09:55:36 +0000 (11:55 +0200)] 
meson: use jinja2 for unit templates

We don't need two (and half) templating systems anymore, yay!

I'm keeping the changes minimal, to make the diff manageable. Some enhancements
due to a better templating system might be possible in the future.

For handling of '## ' — see the next commit.

3 years agomeson: replace some m4 templates with jinja2
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 09:55:36 +0000 (11:55 +0200)] 
meson: replace some m4 templates with jinja2

m4 was nice in '85, but the syntax feels a bit dated. Since we use python for
meson, let's use a popular python templating engine to replace some m4 usage.

A little nicety is that typos are caught:

FAILED: sysusers.d/systemd-remote.conf
/usr/bin/meson --internal exe --capture sysusers.d/systemd-remote.conf -- /home/zbyszek/src/systemd/tools/meson-render-jinja2.py config.h ../sysusers.d/systemd-remote.conf.j2
Traceback (most recent call last):
  File "/home/zbyszek/src/systemd/tools/meson-render-jinja2.py", line 28, in <module>
    print(render(sys.argv[2], defines))
  File "/home/zbyszek/src/systemd/tools/meson-render-jinja2.py", line 24, in render
    return template.render(defines)
  File "/usr/lib/python3.9/site-packages/jinja2/environment.py", line 1090, in render
    self.environment.handle_exception()
  File "/usr/lib/python3.9/site-packages/jinja2/environment.py", line 832, in handle_exception
    reraise(*rewrite_traceback_stack(source=source))
  File "/usr/lib/python3.9/site-packages/jinja2/_compat.py", line 28, in reraise
    raise value.with_traceback(tb)
  File "<template>", line 8, in top-level template code
jinja2.exceptions.UndefinedError: 'HAVE_MICROHTTP' is undefined

This checking mirrors what 349cc4a507c4d84fcadf61f42159ea6412717896 did for C defines.

3 years agomeson, mkosi: pull in jinja2 as required
Zbigniew Jędrzejewski-Szmek [Sun, 16 May 2021 13:31:00 +0000 (15:31 +0200)] 
meson, mkosi: pull in jinja2 as required

In preparation for subsequent changes.

3 years agomodules-load: inline interator variable
Zbigniew Jędrzejewski-Szmek [Fri, 7 May 2021 11:24:03 +0000 (13:24 +0200)] 
modules-load: inline interator variable

3 years agotest/run-unit-tests: make script compatible with python3.6
Zbigniew Jędrzejewski-Szmek [Tue, 18 May 2021 08:21:34 +0000 (10:21 +0200)] 
test/run-unit-tests: make script compatible with python3.6

dataclasses were added in python3.7, but bionic has python3.6.
Yes, the new code is a travesty, but it does the job.

Fixes #19640.

3 years agonetwork: fix Link reference counter issue 19631/head
Yu Watanabe [Fri, 14 May 2021 06:58:15 +0000 (15:58 +0900)] 
network: fix Link reference counter issue

Previously, when link_new() fails, `link_unref()` was called, so,
`Manager::links` may become dirty.
This introduces `link_drop_or_unref()` and it will be called on
failure.

3 years agonetwork: also drop requests when link enters linger state
Yu Watanabe [Mon, 17 May 2021 06:32:57 +0000 (15:32 +0900)] 
network: also drop requests when link enters linger state

Otherwise, if link is removed, several references to the link in remain
exist in requests.

3 years agonetwork: merge link_drop() and link_detach_from_manager()
Yu Watanabe [Mon, 17 May 2021 06:40:15 +0000 (15:40 +0900)] 
network: merge link_drop() and link_detach_from_manager()

link_detach_from_manager() is only called by link_drop(). It is not
necessary to split such tiny function.

3 years agonetwork: fix possible message counter double decrement
Yu Watanabe [Mon, 17 May 2021 06:23:57 +0000 (15:23 +0900)] 
network: fix possible message counter double decrement

When after_configure() for a request fails, then the request is not
removed from the queue at that time, and the link enters to failed
state. After that, if the link is reconfigured or its carrier is lost,
then the request is dropped from the queue, and the message_counter is
decreased. However, the counter is already or will be also decreased
when the corresponding netlink reply is received.
So, the counter is decreased twice.

3 years agotest-network: add testcases for ServerAddress= 19611/head
Yu Watanabe [Fri, 14 May 2021 11:57:10 +0000 (20:57 +0900)] 
test-network: add testcases for ServerAddress=

3 years agonetwork: dhcp-server: introduce ServerAddress= setting
Yu Watanabe [Fri, 14 May 2021 11:27:33 +0000 (20:27 +0900)] 
network: dhcp-server: introduce ServerAddress= setting

This may be useful when the link which DHCP server running on has
multiple static addresses.

3 years agonetwork: address: introduce link_get_ipv4/ipv6_address()
Yu Watanabe [Fri, 14 May 2021 08:33:32 +0000 (17:33 +0900)] 
network: address: introduce link_get_ipv4/ipv6_address()

3 years agonetwork: use UINT32_C() macro
Yu Watanabe [Mon, 17 May 2021 10:33:02 +0000 (19:33 +0900)] 
network: use UINT32_C() macro

3 years agonetwork: introduce address_set_broadcast()
Yu Watanabe [Mon, 17 May 2021 10:31:55 +0000 (19:31 +0900)] 
network: introduce address_set_broadcast()

3 years agonetwork: use config_parse_in_addr_non_null()
Yu Watanabe [Fri, 14 May 2021 07:52:42 +0000 (16:52 +0900)] 
network: use config_parse_in_addr_non_null()

3 years agoconf-parser: introduce config_parse_in_addr_non_null()
Yu Watanabe [Fri, 14 May 2021 07:35:34 +0000 (16:35 +0900)] 
conf-parser: introduce config_parse_in_addr_non_null()

3 years agoman: only the system manager does not pass vars in ManagerEnvironment=
Anita Zhang [Tue, 18 May 2021 08:23:36 +0000 (01:23 -0700)] 
man: only the system manager does not pass vars in ManagerEnvironment=

User managers always pass their environment on to their children.
Make that clear in the description of ManagerEnvironment= which
states that none of those args will get passed to child processes of
service managers.

3 years agofix bash shebangs
Jörg Thalheim [Mon, 17 May 2021 18:14:39 +0000 (18:14 +0000)] 
fix bash shebangs

3 years agonspawn: bring back the word `may` in error text
Olle Lundberg [Mon, 17 May 2021 14:20:23 +0000 (16:20 +0200)] 
nspawn: bring back the word `may` in error text

In the change set 6c045a999800c62368470938307951bb669f5afc the error
text for the old flag `--private-users-chown` was repurposed for the
new flag `--private-users-ownership=own` and while doing so the word
`may` was dropped leading to a grammatically incorrect error text.

3 years agotest: Allow running only a subset of integration tests by setting SELECTED_TESTS
Balint Reczey [Mon, 10 May 2021 18:46:37 +0000 (20:46 +0200)] 
test: Allow running only a subset of integration tests by setting SELECTED_TESTS

3 years agomkosi: stop pulling in workaround packages
Zbigniew Jędrzejewski-Szmek [Mon, 17 May 2021 07:59:02 +0000 (09:59 +0200)] 
mkosi: stop pulling in workaround packages

libfido2 was pulled in recently [1], and the dependency on libzstd has been
present for a long time.

nano is now the default editor in Fedora [2], but we still want to pull it in
to have an editor in minimal images.

[1] https://bugzilla.redhat.com/show_bug.cgi?id=1949505
[2] https://fedoraproject.org/wiki/Changes/UseNanoByDefault

3 years agoci: build with gcc-11 as well
Frantisek Sumsal [Sun, 16 May 2021 10:42:08 +0000 (12:42 +0200)] 
ci: build with gcc-11 as well

Focal builds for gcc-11 are finally available, so let's put them into
some use.

3 years agoFixed a typo
ei-ke [Sun, 16 May 2021 16:12:12 +0000 (18:12 +0200)] 
Fixed a typo

3 years agodocs: Update link to journal file format codebase
Milan [Sun, 16 May 2021 09:09:34 +0000 (11:09 +0200)] 
docs: Update link to journal file format codebase

3 years agodocs: Update link to journal-def.h
Milan [Sat, 15 May 2021 21:27:23 +0000 (23:27 +0200)] 
docs: Update link to journal-def.h

3 years agonetwork:dhcp4_server_configure returns if not able to get timezone
tramsay [Mon, 5 Apr 2021 22:12:49 +0000 (17:12 -0500)] 
network:dhcp4_server_configure returns if not able to get timezone

When /etc/localtime is a symbolic link pointing to another symbolic
link, get_timezone will return -EINVAL instead of the timezone.
This issue can cause systemd-networkd DHCPServer to fail.

Instead of returning failure, log a warning indicating that that
the timezone will not be sent.

modified:   networkd-dhcp-server.c

3 years agoAdd crypttab option silent
Sebastian Blunt [Sat, 15 May 2021 03:39:54 +0000 (20:39 -0700)] 
Add crypttab option silent

Adds a crypttab option 'silent' that enables the AskPasswordFlag
ASK_PASSWORD_SILENT. This allows usage of systemd-cryptsetup to default
to silent mode, rather than requiring the user to press tab every time.

3 years agotest: combine stdout/stderr from failed test
Dan Streetman [Fri, 30 Apr 2021 00:21:10 +0000 (20:21 -0400)] 
test: combine stdout/stderr from failed test

Printing stdout and stderr from a failed test makes it harder to
interpret what the specific problem was; instead let's print out
the lines in order as we got them when the test was run

Also save failed test output to file if ARTIFACT_DIRECTORY is defined

3 years agoMerge pull request #19612 from keszybz/meson-0.58-quieting
Zbigniew Jędrzejewski-Szmek [Sat, 15 May 2021 08:49:10 +0000 (10:49 +0200)] 
Merge pull request #19612 from keszybz/meson-0.58-quieting

Make meson output quiet again

3 years agoresolved: fix braino with reference counting and linked lists
Zbigniew Jędrzejewski-Szmek [Fri, 14 May 2021 08:49:24 +0000 (10:49 +0200)] 
resolved: fix braino with reference counting and linked lists

In 0e0fd08fc832b8f42e567d722d388eba086da5ff I added reference counts to keep
track of the DnsQueryCandidate objects. Unfortunately, dns_query_unref_candidates()
was written as

     while (q->candidates)
           dns_query_candidate_unref(q->candidates);

i.e. it would keep dropping the reference count as many times as needed for it
to hit 0, making the patch less than fully effective.

dns_query_unref_candidates() is renamed to dns_query_detach_candidates() and
changed to drop exactly one reference from each of the linked candidates.

Example failure:
==463== Invalid read of size 8
==463==    at 0x419C93: dns_query_candidate_go (resolved-dns-query.c:159)
==463==    by 0x41A143: dns_query_candidate_notify (resolved-dns-query.c:304)
==463==    by 0x434BD6: dns_transaction_complete (resolved-dns-transaction.c:437)
==463==    by 0x436A0F: dns_transaction_process_dnssec (resolved-dns-transaction.c:976)
==463==    by 0x4378C1: dns_transaction_process_reply (resolved-dns-transaction.c:1387)
==463==    by 0x437CE9: on_dns_packet (resolved-dns-transaction.c:1444)
==463==    by 0x4B2DC9B: source_dispatch (sd-event.c:3512)
==463==    by 0x4B2FB1F: sd_event_dispatch (sd-event.c:4077)
==463==    by 0x4B2FFFA: sd_event_run (sd-event.c:4138)
==463==    by 0x4B301D6: sd_event_loop (sd-event.c:4159)
==463==    by 0x464A24: run (resolved.c:92)
==463==    by 0x464B3C: main (resolved.c:99)
==463==  Address 0x5f409d0 is 32 bytes inside a block of size 72 free'd
==463==    at 0x48410E4: free (vg_replace_malloc.c:755)
==463==    by 0x418EDF: mfree (alloc-util.h:48)
==463==    by 0x4197E8: dns_query_candidate_free (resolved-dns-query.c:67)
==463==    by 0x4198B7: dns_query_candidate_unref (resolved-dns-query.c:70)
==463==    by 0x41A2E3: dns_query_unref_candidates (resolved-dns-query.c:337)
==463==    by 0x41C5FE: dns_query_cname_redirect (resolved-dns-query.c:1028)
==463==    by 0x41CA04: dns_query_process_cname_one (resolved-dns-query.c:1128)
==463==    by 0x41CA80: dns_query_process_cname_many (resolved-dns-query.c:1157)
==463==    by 0x40C0BD: bus_method_resolve_hostname_complete (resolved-bus.c:198)
==463==    by 0x41B312: dns_query_complete (resolved-dns-query.c:562)
==463==    by 0x41C1AC: dns_query_accept (resolved-dns-query.c:922)
==463==    by 0x41C2C4: dns_query_ready (resolved-dns-query.c:955)
==463==    by 0x41A162: dns_query_candidate_notify (resolved-dns-query.c:314)
==463==    by 0x434BD6: dns_transaction_complete (resolved-dns-transaction.c:437)
==463==    by 0x438995: dns_transaction_prepare (resolved-dns-transaction.c:1728)
==463==    by 0x43921D: dns_transaction_go (resolved-dns-transaction.c:1928)
==463==    by 0x419C7C: dns_query_candidate_go (resolved-dns-query.c:163)
==463==    by 0x41A143: dns_query_candidate_notify (resolved-dns-query.c:304)
==463==    by 0x434BD6: dns_transaction_complete (resolved-dns-transaction.c:437)
==463==    by 0x436A0F: dns_transaction_process_dnssec (resolved-dns-transaction.c:976)
==463==    by 0x4378C1: dns_transaction_process_reply (resolved-dns-transaction.c:1387)
==463==    by 0x437CE9: on_dns_packet (resolved-dns-transaction.c:1444)
==463==    by 0x4B2DC9B: source_dispatch (sd-event.c:3512)
==463==    by 0x4B2FB1F: sd_event_dispatch (sd-event.c:4077)
==463==    by 0x4B2FFFA: sd_event_run (sd-event.c:4138)
==463==    by 0x4B301D6: sd_event_loop (sd-event.c:4159)
==463==    by 0x464A24: run (resolved.c:92)
==463==    by 0x464B3C: main (resolved.c:99)
==463==  Block was alloc'd at
==463==    at 0x483E86F: malloc (vg_replace_malloc.c:380)
==463==    by 0x418F81: malloc_multiply (alloc-util.h:96)
==463==    by 0x419378: dns_query_candidate_new (resolved-dns-query.c:23)
==463==    by 0x41B42C: dns_query_add_candidate (resolved-dns-query.c:582)
==463==    by 0x41BB7A: dns_query_go (resolved-dns-query.c:762)
==463==    by 0x40CE3A: bus_method_resolve_hostname (resolved-bus.c:464)
==463==    by 0x4A84B86: method_callbacks_run (bus-objects.c:414)
==463==    by 0x4A87961: object_find_and_run (bus-objects.c:1323)
==463==    by 0x4A87FEE: bus_process_object (bus-objects.c:1443)
==463==    by 0x4AA3434: process_message (sd-bus.c:2964)
==463==    by 0x4AA3623: process_running (sd-bus.c:3006)
==463==    by 0x4AA4110: bus_process_internal (sd-bus.c:3226)
==463==    by 0x4AA41EF: sd_bus_process (sd-bus.c:3253)
==463==    by 0x4AA5343: io_callback (sd-bus.c:3604)
==463==    by 0x4B2DC9B: source_dispatch (sd-event.c:3512)
==463==    by 0x4B2FB1F: sd_event_dispatch (sd-event.c:4077)
==463==    by 0x4B2FFFA: sd_event_run (sd-event.c:4138)
==463==    by 0x4B301D6: sd_event_loop (sd-event.c:4159)
==463==    by 0x464A24: run (resolved.c:92)
==463==    by 0x464B3C: main (resolved.c:99)

Fixes #19376.

3 years agoRevert "tools/make-directive-index: parallelize"
Zbigniew Jędrzejewski-Szmek [Fri, 14 May 2021 15:53:31 +0000 (17:53 +0200)] 
Revert "tools/make-directive-index: parallelize"

This reverts commit a2031de849da52aa85b7e4326c0112ed7e5b5672.

The patch itself seems OK, but it exposes a bug in lxml or libxml2-2.9.12 which
was just released. This is being resolved in
https://gitlab.gnome.org/GNOME/libxml2/-/issues/255, but it might be while. So
let's revert this for now to unbreak our CI.

Fixes #19601.

3 years agomeson: revert the change to unquote commands in add_install_script 19612/head
Zbigniew Jędrzejewski-Szmek [Fri, 14 May 2021 14:12:51 +0000 (16:12 +0200)] 
meson: revert the change to unquote commands in add_install_script

Old meson fails with:
Element not a string: [<Holder: <ExternalProgram 'sh' -> ['/bin/sh']>>, '-c', 'test -n "$DESTDIR" || /bin/journalctl --update-catalog']

I'm doing it as a revert so that it's easy to undo the revert when we require
newer meson. The effect is not so bad, maybe a dozen or so lines about finding
'sh'.

3 years agofix typo
Yu Watanabe [Fri, 14 May 2021 16:59:23 +0000 (01:59 +0900)] 
fix typo

3 years agoMerge pull request #19609 from keszybz/networkd-dhcp-man
Lennart Poettering [Fri, 14 May 2021 14:26:18 +0000 (16:26 +0200)] 
Merge pull request #19609 from keszybz/networkd-dhcp-man

Tweak man page ordering for DHCPv[46] options

3 years agomeson: print autodetected sbat fields
Zbigniew Jędrzejewski-Szmek [Fri, 14 May 2021 12:20:33 +0000 (14:20 +0200)] 
meson: print autodetected sbat fields

...
Message: sbat-distro (from ID): fedora
Message: sbat-distro-summary (from NAME): Fedora
Message: sbat-distro-url (from BUG_REPORT_URL): https://bugzilla.redhat.com/
...

3 years agomeson: call find_program() once and reuse the variable everywhere
Zbigniew Jędrzejewski-Szmek [Fri, 14 May 2021 12:16:17 +0000 (14:16 +0200)] 
meson: call find_program() once and reuse the variable everywhere

Meson 0.58 has gotten quite bad with emitting a message every time
a quoted command is used:
Program /home/zbyszek/src/systemd-work/tools/meson-make-symlink.sh found: YES (/home/zbyszek/src/systemd-work/tools/meson-make-symlink.sh)
Program sh found: YES (/usr/bin/sh)
Program sh found: YES (/usr/bin/sh)
Program sh found: YES (/usr/bin/sh)
Program sh found: YES (/usr/bin/sh)
Program sh found: YES (/usr/bin/sh)
Program sh found: YES (/usr/bin/sh)
Program xsltproc found: YES (/usr/bin/xsltproc)
Configuring custom-entities.ent using configuration
Message: Skipping bootctl.1 because ENABLE_EFI is false
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Message: Skipping journal-remote.conf.5 because HAVE_MICROHTTPD is false
Message: Skipping journal-upload.conf.5 because HAVE_MICROHTTPD is false
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Message: Skipping loader.conf.5 because ENABLE_EFI is false
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
Program ln found: YES (/usr/bin/ln)
...

Let's suffer one message only for each command. Hopefully we can silence
even this when https://github.com/mesonbuild/meson/issues/8642 is
resolved.

3 years agoman: reword descriptions of two DHCPv4 options 19609/head
Zbigniew Jędrzejewski-Szmek [Fri, 14 May 2021 07:04:30 +0000 (09:04 +0200)] 
man: reword descriptions of two DHCPv4 options

3 years agoman: reorder items in [DHCPv4] and [DHCPv6] sections
Zbigniew Jędrzejewski-Szmek [Fri, 14 May 2021 06:58:44 +0000 (08:58 +0200)] 
man: reorder items in [DHCPv4] and [DHCPv6] sections

The settings were listen in a completely random order, also different
between the v4 and v6 sections. Order by "options sent", "options received",
"communication settings" in both sections.

Also minor formatting changes are done, e.g. "=" is added in various places.

3 years agonetwork: shorten code a bit and update log message
Yu Watanabe [Fri, 14 May 2021 03:08:49 +0000 (12:08 +0900)] 
network: shorten code a bit and update log message

3 years agoMerge pull request #19592 from yuwata/network-introduce-describe-bus-method
Zbigniew Jędrzejewski-Szmek [Fri, 14 May 2021 07:34:06 +0000 (09:34 +0200)] 
Merge pull request #19592 from yuwata/network-introduce-describe-bus-method

network: introduce Describe() bus method and use it in networkctl

3 years agoshell-completion: support --json option for hostnamectl 19592/head
Yu Watanabe [Wed, 12 May 2021 16:37:41 +0000 (01:37 +0900)] 
shell-completion: support --json option for hostnamectl

3 years agonetworkctl: introduce --json option for "status" and "list" commands
Yu Watanabe [Wed, 12 May 2021 15:22:14 +0000 (00:22 +0900)] 
networkctl: introduce --json option for "status" and "list" commands

When `--json` option is specified, "status" and "list" commands gives
the same information, as originally "list" just gives partial
information of "status" in different format.

3 years agojson: make JSON_VARIANT_ARRAY/OBJECT_FOREACH() nestable
Yu Watanabe [Fri, 14 May 2021 00:05:20 +0000 (09:05 +0900)] 
json: make JSON_VARIANT_ARRAY/OBJECT_FOREACH() nestable

3 years agonetworkctl: use table_set_empty_string()
Yu Watanabe [Wed, 12 May 2021 16:12:58 +0000 (01:12 +0900)] 
networkctl: use table_set_empty_string()

3 years agonetwork: introduce Describe() method for manager and links
Yu Watanabe [Wed, 12 May 2021 13:11:09 +0000 (22:11 +0900)] 
network: introduce Describe() method for manager and links

3 years agoudev,network: make link_get_type_string() return negative errno on failure
Yu Watanabe [Wed, 12 May 2021 12:07:14 +0000 (21:07 +0900)] 
udev,network: make link_get_type_string() return negative errno on failure

And make net_match_config() propagate the error.

3 years agonetwork: move and rename network_get() -> link_get_network()
Yu Watanabe [Wed, 12 May 2021 11:58:06 +0000 (20:58 +0900)] 
network: move and rename network_get() -> link_get_network()

This also drops test_network_get(). But it tests almost nothing. So, it
should be ok to not re-implement something like test_link_get_network().

3 years agorun: update checks to allow running with a user's bus
Anita Zhang [Thu, 13 May 2021 08:17:51 +0000 (01:17 -0700)] 
run: update checks to allow running with a user's bus

systemd-run is documented to as being able to connect and run on a
specific user bus with "--user --machine=lennart@.host" arguments.
This PR updates some logic that prevented this from working.

3 years agotools/make-directive-index: parallelize
Zbigniew Jędrzejewski-Szmek [Wed, 12 May 2021 09:24:25 +0000 (11:24 +0200)] 
tools/make-directive-index: parallelize

I occasionally do 'build/man/man systemd.directives' when working on man pages,
and it's annoying slow. By paralellizing the parsing of xml, we can make it a
bit faster.

This is still rather innefficient. Only the parsing part is serialized, xml is
still produced serially at the end, which is hard to avoid.

$ ninja -C build man/systemd.directives.xml
before:
8.20s user 0.21s system 99% cpu 8.460 total
8.33s user 0.18s system 98% cpu 8.619 total
8.72s user 0.19s system 98% cpu 9.019 total

after:
13.99s user 0.73s system 345% cpu 4.262 total
14.15s user 0.35s system 348% cpu 4.161 total
14.33s user 0.35s system 339% cpu 4.321 total

I.e. it uses almost twice as much cpu, but cuts the wallclock time down (on a
2-core/4-thread cpu) to about half too, which is an overall win if you're just
trying to render the man page.

The change from list and .append() to set and .add() is something that could
have been done before too, but it's noticable now. It cuts down on the
serialization/deserialization time (about .2s).

3 years agoAdd Microsoft Pro Intellimouse MOUSE_DPI to hwdb
Simon Watts [Wed, 12 May 2021 21:22:39 +0000 (22:22 +0100)] 
Add Microsoft Pro Intellimouse MOUSE_DPI to hwdb

- Internet specifications give 1600 DPI @ 1000Hz for this sensor
- Confirmed experimentally via `mouse-dpi-tool`
- vid, pid, and name match string from `mouse-dpi-tool`

3 years agoUpdate Korean translation (#19083)
Seong-ho Cho [Thu, 13 May 2021 08:19:48 +0000 (17:19 +0900)] 
Update Korean translation (#19083)

Co-authored-by: Seong-ho Cho <shcho@gnome.org>
3 years agoMerge pull request #19590 from keszybz/comments-and-service-modernization
Yu Watanabe [Thu, 13 May 2021 03:17:19 +0000 (12:17 +0900)] 
Merge pull request #19590 from keszybz/comments-and-service-modernization

Comments and service modernization

3 years agoMerge pull request #19567 from poettering/ipv4-ipv6-lowercase
Zbigniew Jędrzejewski-Szmek [Wed, 12 May 2021 10:21:58 +0000 (12:21 +0200)] 
Merge pull request #19567 from poettering/ipv4-ipv6-lowercase

various follow-ups to socket-bind logic

3 years agoresolved.conf.in: add missing Quad9 servers
Michael Catanzaro [Tue, 11 May 2021 13:24:55 +0000 (08:24 -0500)] 
resolved.conf.in: add missing Quad9 servers

The example configuration is missing half of Quad9's addresses.

3 years agoresolved: be more careful with weird links with low MTUs
Lennart Poettering [Tue, 11 May 2021 20:21:52 +0000 (22:21 +0200)] 
resolved: be more careful with weird links with low MTUs

Apparently CAN links will show up in rtnetlink with very low MTUs. We
shouldn't consider them relevant if no IP is spoken over them, since
these MTUs are irrelevant for us then.

Hence, let's check if there's an address assigned to the link before
considering its MTU.

As additional safety net filter out MTUs smaller than the minimum DNS
packet size, too.

Finally, in case we don't find any suitable interface MTU, let's default
to 1500 as the generic Ethernet MTU.

Fixes: #19396
3 years agopam: fix typo try_authtok → use_authtok
Lennart Poettering [Wed, 12 May 2021 08:33:27 +0000 (10:33 +0200)] 
pam: fix typo try_authtok → use_authtok

This was a copy/paste mistae apparently, there's not "try_authtok" and
this was supposed to copy what Fedora uses, which uses "use_authtok"
correctly. Hence adjust this.

Fixes: #19369
3 years agoMerge pull request #19533 from yuwata/network-queue
Zbigniew Jędrzejewski-Szmek [Wed, 12 May 2021 10:12:22 +0000 (12:12 +0200)] 
Merge pull request #19533 from yuwata/network-queue

network: introduce queue to configure address, route, etc

3 years agocore/service: modernization 19590/head
Zbigniew Jędrzejewski-Szmek [Mon, 10 May 2021 10:56:04 +0000 (12:56 +0200)] 
core/service: modernization

3 years agotest-bpf-foreign-programs: fix message
Zbigniew Jędrzejewski-Szmek [Mon, 10 May 2021 10:54:52 +0000 (12:54 +0200)] 
test-bpf-foreign-programs: fix message

3 years agodocs/HACKING: wrap long lines
Zbigniew Jędrzejewski-Szmek [Mon, 10 May 2021 06:35:21 +0000 (08:35 +0200)] 
docs/HACKING: wrap long lines

3 years agosd-event: tweak comments
Zbigniew Jędrzejewski-Szmek [Sat, 8 May 2021 09:40:47 +0000 (11:40 +0200)] 
sd-event: tweak comments

3 years agotimedated: make ntp_synced() static
Zbigniew Jędrzejewski-Szmek [Wed, 12 May 2021 07:39:28 +0000 (09:39 +0200)] 
timedated: make ntp_synced() static

No need to have this in basic.

3 years agoMerge pull request #18986 from poettering/oomd-varlink-fix
Zbigniew Jędrzejewski-Szmek [Wed, 12 May 2021 09:36:32 +0000 (11:36 +0200)] 
Merge pull request #18986 from poettering/oomd-varlink-fix

varlink ref fix

3 years agoMerge pull request #19506 from xnox/ship-stub-elf
Zbigniew Jędrzejewski-Szmek [Wed, 12 May 2021 07:45:36 +0000 (09:45 +0200)] 
Merge pull request #19506 from xnox/ship-stub-elf

boot/efi: install ELF linux.elf.stub in addition to PE linux.efi.stub

3 years agoMerge pull request #19581 from yuwata/specifier-refuse-too-long-results
Lennart Poettering [Wed, 12 May 2021 07:42:08 +0000 (09:42 +0200)] 
Merge pull request #19581 from yuwata/specifier-refuse-too-long-results

specifier: refuse too long results