Commit Graph
23302 Commits
Author SHA1 Message Date
Lennart Poettering 32d38c584e Merge pull request #1798 from evverx/fix-test-udev
test-udev: small fixes
2015-11-09 18:33:22 +01:00
Lennart Poettering 6c9e781eba Merge pull request #1799 from jengelh/doc
doc: typo and ortho fixes
2015-11-09 18:16:21 +01:00
Lennart Poettering e8b4b135e5 Merge pull request #1807 from michich/boot-timer
core/timer: in containers OnBootSec should count from container startup
2015-11-09 17:30:58 +01:00
Lennart Poettering dfa1f15874 Merge pull request #1794 from karelzak/size_limit
core: support IEC suffixes for RLIMIT stuff
2015-11-09 17:02:12 +01:00
Lennart Poettering f094cb287e Merge pull request #1817 from iaguis/nspawn-custom-service-3
nspawn: support custom container service name
2015-11-09 16:50:57 +01:00
Iago López Galeiras 9fb1642519 detect-virt: add rkt app container runtime 2015-11-09 16:40:35 +01:00
Iago López Galeiras 6aadfa4c52 nspawn: support custom container service name
We were hardcoding "systemd-nspawn" as the value of the $container env
variable and "nspawn" as the service string in machined registration.

This commit allows the user to configure it by setting the
$SYSTEMD_NSPAWN_CONTAINER_SERVICE env variable when calling
systemd-nspawn.

If $SYSTEMD_NSPAWN_CONTAINER_SERVICE is not set, we use the string
"systemd-nspawn" for both, fixing the previous inconsistency.
2015-11-09 16:40:05 +01:00
Lennart Poettering 4286219103 Merge pull request #1796 from michaelolbrich/journal-size
journal: reduce minimum journal file size to 512 KiB
2015-11-09 14:31:51 +01:00
Michal Schmidt c1d9ba9978 core/timer: in containers OnBootSec should count from container startup
In Fedora dnf-makecache.timer specifies OnBootSec=10min, but it fired
during boot in systemd-nspawn, because the clock ticks since the host's
boot.

Fix it by treating OnBootSec the same as OnStartupSec when running in
a container.
2015-11-07 15:16:00 +01:00
Daniel Mack 2933d599c2 Merge pull request #1801 from chuyd/fix-typos
test: Fix typo in TEST-03-JOBS/test-jobs.sh
2015-11-07 12:31:34 +01:00
Daniel Mack 0b9db4f49f Merge pull request #1803 from phomes/unused-var
core: remove unused variable
2015-11-07 12:31:23 +01:00
Thomas Hindoe Paaboel Andersen 6a0f3175dc core: remove unused variable
unused since 7b2313f5
2015-11-07 11:05:58 +01:00
Jesus Ornelas Aguayo 59ef392e00 test: Fix typo in TEST-03-JOBS/test-jobs.sh
Fix typo s/enqueueing/enqueuing/

Signed-off-by: Jesus Ornelas Aguayo <jesus.ornelas.aguayo@intel.com>
2015-11-06 13:01:21 -06:00
Ronny Chevalier f9a1dafb93 Merge pull request #1795 from msekletar/networkd-forward
networkd: fix option name in log message
2015-11-06 18:14:24 +01:00
Ronny Chevalier c719f96db5 Merge pull request #1800 from evverx/fix-test-execute
test-execute: don't use /usr/bin/uname. use sh and PATH
2015-11-06 16:59:05 +01:00
Evgeny Vereshchagin 64810140a1 test-execute: don't use /usr/bin/uname. use sh and PATH 2015-11-06 15:45:32 +00:00
kayrus af105d0314 Fixed kernel-command-line links 2015-11-06 14:59:42 +01:00
Jan Engelhardt 7ca4155737 doc: use expanded forms for written style 2015-11-06 13:46:26 +01:00
Jan Engelhardt a8eaaee72a doc: correct orthography, word forms and missing/extraneous words 2015-11-06 13:45:21 +01:00
Evgeny Vereshchagin 1c2b0d553f test-udev: small fixes
* print '\n' on error
* use UDEVLIBEXECDIR (udev_rules_new uses it too)
2015-11-06 12:14:02 +00:00
Jan Engelhardt b938cb902c doc: correct punctuation and improve typography in documentation 2015-11-06 13:00:02 +01:00
Michael Olbrich 16098e9379 journal: reduce minimum journal file size to 512 KiB
For low end embedded systems 4 MiB for each journal file is a lot of
memory. Journald will use at least 512 KiB even if JOURNAL_FILE_SIZE_MIN is
set to less than that so just use 512 KiB.
2015-11-06 12:10:34 +01:00
Karel Zak 412ea7a936 core: support IEC suffixes for RLIMIT stuff
Let's make things more user-friendly and support for example

  LimitAS=16G

rather than force users to always use LimitAS=16106127360.

The change is relevant for options:

  [Default]Limit{FSIZE,DATA,STACK,CORE,RSS,AS,MEMLOCK,MSGQUEUE}

The patch introduces config_parse_bytes_limit(), it's the same as
config_parse_limit() but uses parse_size() tu support the suffixes.

Addresses: https://github.com/systemd/systemd/issues/1772
2015-11-06 11:06:52 +01:00
Michal Sekletar 85e070c2b3 networkd: fix option name in log message 2015-11-06 10:51:34 +01:00
Filipe Brandenburger 0247447e96 extract-word: Skip coalesced separators in place
Just skip them in place, instead of setting separator=true. We only do
that in a single place (while finding a separator outside of quote or
backslash states) so we don't really need a separate state for it.

Tested that no regressions were introduced in test-extract-word. Ran a
full `make check` and also installed the binaries on a test system and
did not see any issues related to parsing unit files or starting units
after a reboot.
2015-11-05 21:57:26 -08:00
Filipe Brandenburger 27fc921b65 extract-word: Do not re-evaluate the state on each parsed character
Use inner loops to keep processing the same state, except when there is
a state change, then break back to the outer loop so that the correct
branch can be selected again.

Tested that no regressions were introduced in test-extract-word.
2015-11-05 21:51:24 -08:00
Filipe Brandenburger 93de9eb76d extract-word: increment pointer p and keep c in sync in for loop
This will make it easier to use inner loops to keep looping in the same
state, by just updating p and c in the same way in the inner loops.

Tested that no regressions were created in test-extract-word.
2015-11-05 21:41:04 -08:00
Filipe Brandenburger 8372da448f extract-word: Check for early bail out before inspecting separators
It's a pretty small optimization but doesn't hurt...

Tested with test-extract-word.
2015-11-05 21:31:29 -08:00
Filipe Brandenburger 3ff13c298d extract-word: replace an use of goto with structured code
Using `goto` might be appropriate for the "finish" cases but it was
really not necessary at this point of the code... Just use if/else
blocks to accomplish the same.

Confirmed that the test cases in test-extract-word keep working as
expected.
2015-11-05 21:19:54 -08:00
Filipe Brandenburger b85e1c2534 extract-word: move start block outside the for loop
This block runs once before all the other handling, so move it outside
the main loop and put it in its own loop until it's finished doing its
job.

Tested by confirming `make check` (and particularly test-extract-word)
still passes and by booting a system with binaries including this
commit.
2015-11-05 21:19:54 -08:00
Michal Schmidt 5263a45b5c sd-resolve: simplify pthread_join() call
POSIX says:
The pthread_join() function shall not return an error code of [EINTR].
2015-11-05 13:44:15 +01:00
Michal Schmidt 6ff6f4d851 timesync: return negative errno from manager_adjust_clock() on error 2015-11-05 13:44:14 +01:00
Michal Schmidt 35607a8d1c nspawn: save errno before reopening log after exec failure 2015-11-05 13:44:12 +01:00
Michal Schmidt 070edd97f3 nspawn: no fake errno
The S_ISREG test does not set errno, so don't use it in the error
message.
2015-11-05 13:44:11 +01:00
Michal Schmidt 4314d33f51 nspawn: simplify error returns
Use the "return log_error_errno(...)" idiom to have fewer curly braces.

The last hunk also fixes the return value of setup_journal(), but the
fix has no practical effect.
2015-11-05 13:44:10 +01:00
Michal Schmidt e26ea7fc2d libsystemd-network: inet_pton does not set errno on parsing error
it would set errno only for an invalid address family.

Also fix a copy&paste error in one error string.
2015-11-05 13:44:10 +01:00
Michal Schmidt 5cfab271fe import: report error before losing errno
unlink() may change errno, so report the error from rename() first, then
unlink.
2015-11-05 13:44:09 +01:00
Michal Schmidt 4546c34193 firstboot: fix errno sign 2015-11-05 13:44:08 +01:00
Michal Schmidt 7bb87460e6 journal: posix_fallocate() does not set errno
manpage says:
 posix_fallocate() returns zero on success, or an error number on
 failure. Note that errno is not set.
2015-11-05 13:44:07 +01:00
Michal Schmidt 709f6e46a3 treewide: use the negative error codes returned by our functions
Our functions return negative error codes.
Do not rely on errno being set after calling our own functions.
2015-11-05 13:44:06 +01:00
Michal Schmidt c3753458fc journal: fix incorrect errno reporting
pread() returns -1 on error and sets errno. Do not use the -1 as errno.
2015-11-05 13:44:06 +01:00
Michal Schmidt 77ba8233f7 journal: use int64_t instead of long for catalog file size
This replaces the use of ftell() with ftello() for 64-bit size on all
archs.

Also drops a pointless check for NULL before calling strbuf_cleanup().
2015-11-05 13:44:05 +01:00
Michal Schmidt 8d2ecdb2cf journal: drop unnecessary write_catalog() parameter
write_catalog() use the hashmap only to get its size. The size is
already given in parameter 'n'.
2015-11-05 13:44:04 +01:00
Michal Schmidt bcf5c276cc log: whitespace style fix 2015-11-05 13:44:03 +01:00
Michal Schmidt ad71eee550 tty-ask-password-agent: fix typo in error message 2015-11-05 13:44:01 +01:00
Vito Caputo ad231c7787 core: still make progress when throttling the manager loop
Don't simply continue after sleeping, it potentially puts us in a state
of spinning doing nothing slowly, if the ratelimit_test() keeps
detecting the need for limiting.

Observed in vms after the host had been suspended for a while, on resume
systemd entered a loop of making zero progress spamming the console
with:
[431942.850090] systemd[1]: Looping too fast. Throttling execution a
little.

I see no reason to have a continue here, the intention should be to
throttle execution, not circumvent it altogether.
2015-11-04 17:32:16 -08:00
Lennart Poettering a6bff4a742 Merge pull request #1761 from ssahani/word
core: parse socket port to extract_first_word
2015-11-04 20:16:14 +01:00
Lennart Poettering 50bcc7f45c Merge pull request #1778 from rhdrjones/detect-virt
detect-virt: one fix and arm/aarch64 dmi detection
2015-11-04 20:11:17 +01:00
Ronny Chevalier ffbc002ca4 Merge pull request #1780 from evverx/fix-install-dbus
test-functions: fix dbus-1 installation
2015-11-04 20:07:23 +01:00
Evgeny Vereshchagin e63b61be53 test-functions: fix dbus-1 installation
The basic setup for the well-known system and session buses is
now done in read-only files in ${datadir} (normally /usr/share).
See the NEWS entry for 1.9.18 for details.

http://cgit.freedesktop.org/dbus/dbus/tree/NEWS
2015-11-04 18:33:37 +00:00