Commit Graph
15010 Commits
Author SHA1 Message Date
Lennart Poettering 7bfe3d44d0 core: when enabling a generated unit file, return a clean error
Let's be precise when the user tries to invoke an "enable" operation on a
generated unit file.
2016-04-12 13:43:29 +02:00
Lennart Poettering f413930863 core: add a new unit file state "generated"
Now that we store the generator directories in LookupPaths we can use this to
intrdouce a new unit file state called "generated", for units in these
directories.

Fixes: #2348
2016-04-12 13:43:29 +02:00
Lennart Poettering a3c4eb0710 core: rework generator dir logic, move the dirs into LookupPaths structure
A long time ago – when generators where first introduced – the directories for
them were randomly created via mkdtemp(). This was changed later so that they
use fixed name directories now. Let's make use of this, and add the genrator
dirs to the LookupPaths structure and into the unit file search path maintained
in it. This has the benefit that the generator dirs are now normal part of the
search path for all tools, and thus are shown in "systemctl list-unit-files"
too.
2016-04-12 13:43:29 +02:00
Lennart Poettering 1dfa3076cf core: drop SysV paths from path-lookup logic
We don't need it anymore, give that sysv-generator can determine the path on
its own now.
2016-04-12 13:43:29 +02:00
Lennart Poettering 4143c6c305 sysv-generator: don't use LookupPath logic for determining SysV paths
The sysv-generator is the only user of the SysV paths these days, let's make it
figure out the right paths on its own.

(In a subsequent commit we can then drop the same logic from LookupPath).
2016-04-12 13:43:29 +02:00
Lennart Poettering 03ce175f4c import: drop unused definition 2016-04-12 13:43:29 +02:00
Lennart Poettering 1ade1cc0bf Merge pull request #3016 from martinpitt/systemctl-enable
Install: correctly report symlink creations
2016-04-12 11:34:44 +02:00
Zbigniew Jędrzejewski-Szmek 6d10d308c6 Do not report masked units as changed (#2921)
* core/unit: extract checking of stat paths into helper function

The same code was repeated three times.

* core: treat masked files as "unchanged"

systemctl prints the "unit file changed on disk" warning
for a masked unit. I think it's better to print nothing in that
case.

When a masked unit is loaded, set mtime as 0. When checking
if a unit with mtime of 0 needs reload, check that the mask
is still in place.

* test-dnssec: fix build without gcrypt

Also reorder the test functions to follow the way they are called
from main().
2016-04-12 11:10:57 +02:00
Evgeny Vereshchagin dbab702a2a tests: port udev-test to log_*_errno (#3015)
SYSTEMD_LOG_LEVEL=debug test/udev-test.pl is working now
Also, fixes CID 1354602
2016-04-11 21:31:57 +02:00
Martin Pitt 3de1521427 Install: correctly report symlink creations
All callers of create_symlink(), such as install_info_symlink_wants(), expect
that to return > 0 if it actually did something, and then return that number.
unit_file_enable() uses that to determine if any action was done
(carries_install_info != 0) and if not, show a "The unit files have no
[Install] section" warning.

Return 1 instead of 0 in the two code paths of create_symlink() when the link
was created or replaced with a new value.

This fixes getting a bogus "No [Install] section" warning when enabling a unit
with full path, like "systemctl enable /some/path/myunit.service".
2016-04-11 21:03:29 +02:00
Lennart Poettering 70a399c43a Merge pull request #3014 from msekletar/nspawn-empty-machine-id-v3
nspawn: always setup machine id (v3)
2016-04-11 17:27:11 +02:00
Michal Sekletar e01ff70a77 nspawn: always setup machine id
We check /etc/machine-id of the container and if it is already populated
we use value from there, possibly ignoring value of --uuid option from
the command line. When dealing with R/O image we setup transient machine
id.

Once we determined machine id of the container, we use this value for
registration with systemd-machined and we also export it via
container_uuid environment variable.

As registration with systemd-machined is done by the main nspawn process
we communicate container machine id established by setup_machine_id from
outer child to the main process by unix domain socket. Similarly to PID
of inner child.
2016-04-11 16:43:16 +02:00
Ronny Chevalier 6c006ed487 Merge pull request #3011 from evverx/dont-silently-skip-test-namespace
tests: don't silently skip `test-namespace`
2016-04-11 13:51:51 +01:00
Martin Pitt 14b6625901 Merge pull request #2996 from keszybz/coverity-fixes
Coverity fixes
2016-04-11 11:19:27 +02:00
Evgeny Vereshchagin d2528deb44 tests: don't silently skip test-namespace 2016-04-10 23:41:04 +00:00
Evgeny Vereshchagin ad43ccb096 tests: ignore some mount errors in test-udev
Fixes:
$ sudo make distcheck
...
FAIL: test/udev-test.pl
...

$ vi systemd-229/_build/sub/test/udev-test.pl.log
...
failed to mount empty
/home/ubuntu/systemd/systemd-229/_inst/lib/udev/rules.d No such file or directory
...
failed to mount empty
/home/ubuntu/systemd/systemd-229/_inst/lib/udev/rules.d No such file or directory
...
414 errors occurred
2016-04-10 20:01:27 +00:00
Zbigniew Jędrzejewski-Szmek 7236ce6e9e core/service: only search for pid if loading from file failed
CID #1237511.
2016-04-08 21:09:17 -04:00
Zbigniew Jędrzejewski-Szmek 783e05d637 core/service: drop return value that is always ignored anyway 2016-04-08 21:09:11 -04:00
Zbigniew Jędrzejewski-Szmek 0b9aa27016 shutdown: use (void)
NULL cgroup is handled below.
2016-04-08 21:09:09 -04:00
Zbigniew Jędrzejewski-Szmek d929b0f98b nspawn: ignore failure to chdir
CID #1322380.
2016-04-08 21:09:06 -04:00
Zbigniew Jędrzejewski-Szmek ddea446252 journal: assert gcry_mpi_scan succeeded
It might be nicer to propagate the error to the caller, but that'd
be a bigger refactoring. This shouldn't really fail, so just add
an assert.

CID #1349697.
2016-04-08 21:08:54 -04:00
Zbigniew Jędrzejewski-Szmek 9d4e7d1380 sd-resolve: ignore error in pthread_join()
CID #1338424.
2016-04-08 21:08:42 -04:00
Zbigniew Jędrzejewski-Szmek 94edd38e1d basic/util: check return value of dup2 in fork_agent()
CID #1304689.
2016-04-08 21:08:29 -04:00
Zbigniew Jędrzejewski-Szmek edfd706d9c import: use (void) more
CID #1299018-9.
2016-04-08 21:08:23 -04:00
Zbigniew Jędrzejewski-Szmek b3b90a25f3 udevadm: assert return value
This mirrors what we do in now().
CID #1351755.
2016-04-08 21:08:21 -04:00
Zbigniew Jędrzejewski-Szmek 045e00cf16 udevd: use (void) to silence coverity
CID #1351429.
2016-04-08 21:08:18 -04:00
Zbigniew Jędrzejewski-Szmek 164d025dd3 resolved: handle oom properly
CID #1349699-1349700.
2016-04-08 21:08:15 -04:00
Zbigniew Jędrzejewski-Szmek 0229100b6c network: check return value
CID #1349698.
2016-04-08 21:08:02 -04:00
Martin Pitt 710a8858a9 Merge pull request #2985 from keszybz/lldp-assert
Replace if with assert_cc in lldp code and a build-sys tweak
2016-04-08 08:31:33 +02:00
Zbigniew Jędrzejewski-Szmek 74dd72d559 Merge pull request #2943 from vinaykul/systemd_duid_review_fixes
DHCP DUID parsing fix, logging fix, man-page fix
2016-04-07 20:19:19 -04:00
Vladimir Panteleev 071e0b8b3a core: downgrade warning about duplicate device names again
Pull request #2412 seemed to have unintentionally reverted
5259bcf6a6, thus reintroducing
https://bugs.freedesktop.org/show_bug.cgi?id=90386.

This commit reverts that part of the commit, changing the
log level to debug again.
2016-04-07 23:48:29 +00:00
Zbigniew Jędrzejewski-Szmek c8cf4dc1e5 lldp: replace if with assert_cc
LLDP_TX_HOLD or one of the other variables might be changed in the future
resulting in a silent error here if the if was just removed.

Replacement for #2983.
2016-04-07 14:29:59 -04:00
Zbigniew Jędrzejewski-Szmek 3c9117545f Merge pull request #2976 from martinpitt/udev-test-tags
Add tags tests to udev-test.pl
2016-04-06 19:45:24 -04:00
Martin Pitt 817ec8cc81 sd-device: Allocate enough room for tags string
Fix commit 1d88a2: We need to allocate another byte for building the "tags"
string, as we append an extra ':' and still need the NUL terminator.
2016-04-06 23:50:39 +02:00
Zbigniew Jędrzejewski-Szmek 7b792fa1a9 Merge pull request #2970 from msekletar/machine-id-prefix-roota
machine-id-setup: simplify by using prefix_roota
2016-04-06 07:58:05 -04:00
Martin Pitt 600101ca28 Merge pull request #2969 from evverx/udev-test-dont-rely-on-underlying-fs-2
tests: don't rely on the underlying fs in test-udev (v2)
2016-04-06 11:51:38 +02:00
Lennart Poettering 354362c46b Merge pull request #2968 from keszybz/journal-upload-watchdog-update-master
Journal upload watchdog update master
2016-04-06 10:50:46 +02:00
Lennart Poettering d4337c15d5 Merge pull request #2944 from keszybz/man-coredump-sysctl
Man coredump sysctl
2016-04-06 10:49:52 +02:00
Lennart Poettering 056f0498fe Merge pull request #2947 from keszybz/test-nss
Add a test for nss modules and some related fixes
2016-04-06 10:48:55 +02:00
Lennart Poettering 382b56622a Merge pull request #2962 from keszybz/value-option
Add `--value` option to systemctl and loginctl to only print values
2016-04-06 10:47:37 +02:00
Lennart Poettering d35da3ae6a Merge pull request #2961 from evverx/fix-activate-sigchld
activate: improve SIGCHLD handler
2016-04-06 10:46:47 +02:00
Michal Sekletar f5e754e0d7 machine-id-setup: simplify by using prefix_roota 2016-04-06 09:55:24 +02:00
Evgeny Vereshchagin 21d9e3f339 tests: don't rely on the underlying fs in test-udev (v2)
* This reverts commit 646048b40a.
Let's test really big numbers again

* Don't be so brutal: use rmdir instead of rm -rf
As suggested https://github.com/systemd/systemd/pull/2966#issuecomment-205751680
2016-04-06 04:08:39 +00:00
Zbigniew Jędrzejewski-Szmek 82e4c2d656 nss-myhostname: remove dead test of variable that was not set 2016-04-05 23:19:56 -04:00
Zbigniew Jędrzejewski-Szmek 2abb5b3b10 test-nss: test the resolution of various names
nss-dns is also "tested". It should be almost always available,
and provides a reference for comparison.
2016-04-05 23:19:56 -04:00
Zbigniew Jędrzejewski-Szmek 8e98476e14 string-table: split long definitions 2016-04-05 23:19:56 -04:00
Zbigniew Jędrzejewski-Szmek e138e7d7fc machinectl: indentation fix 2016-04-05 23:03:58 -04:00
Zbigniew Jędrzejewski-Szmek 855005230b machinectl: add --value option 2016-04-05 23:03:58 -04:00
Zbigniew Jędrzejewski-Szmek e8ceb82e21 Merge pull request #2966 from evverx/udev-test-dont-rely-on-underlying-fs
tests: don't rely on underlying fs in udev-test, use tmpfs instead
2016-04-05 20:36:01 -04:00
Zbigniew Jędrzejewski-Szmek 0aa176a751 journal-upload: make watchdog state non-static
Also parse watchdog config when creating the Uploader object.
2016-04-05 20:28:56 -04:00