1
0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Commit Graph

23276 Commits

Author SHA1 Message Date
Lennart Poettering
a4c1800284 core: accept time units for time-based resource limits
Let's make sure "LimitCPU=30min" can be parsed properly, following the
usual logic how we parse time values. Similar for LimitRTTIME=.

While we are at it, extend a bit on the man page section about resource
limits.

Fixes: #1772
2015-11-10 17:36:46 +01:00
Lennart Poettering
d580265eb4 core: when parsing resource limits, be more careful with types and corner cases
Let's not convert RLIM_INFINITY to "unsigned long long" and then back to
rlim_t, but let's leave it in the right type right-away.

Parse resource limits as 64 bit in all cases, as according to the man
page that's what libc does anyway.

Make sure setting a resource limit to (uint64_t) -1 results in a parsing
error, and isn't implicitly converted to RLIM_INFINITY.
2015-11-10 17:31:31 +01:00
Lennart Poettering
65dce26488 core: simplify parsing of capability bounding set settings
Let's generate a simple error, and that's it. Let's not try to be smart
and record the last word that failed.

Also, let's make sure we don't compare numeric values with 0 by relying
on C's downgrade-to-bool feature, as suggested in CODING_STYLE.
2015-11-10 17:31:31 +01:00
Lennart Poettering
519cffec89 time-util: add parse_time(), which is like parse_sec() but allows specification of default time unit if none is specified
This is useful if we want to parse RLIMIT_RTTIME values where the common
UNIX syntax is without any units but refers to a non-second unit (µs in
this case), but where we want to allow specification of units.
2015-11-10 17:31:31 +01:00
Lennart Poettering
75eb615480 defs: rework CONF_DIRS_NULSTR() macro
The macro is generically useful for putting together search paths, hence
let's make it truly generic, by dropping the implicit ".d" appending it
does, and leave that to the caller. Also rename it from
CONF_DIRS_NULSTR() to CONF_PATHS_NULSTR(), since it's not strictly about
dirs that way, but any kind of file system path.

Also, mark CONF_DIR_SPLIT_USR() as internal macro by renaming it to
_CONF_PATHS_SPLIT_USR() so that the leading underscore indicates that
it's internal.
2015-11-10 17:31:31 +01:00
Lennart Poettering
b1f044bbc4 cgls: when showing root slice, put -.slice at top of tree 2015-11-10 17:31:31 +01:00
Lennart Poettering
a6a4d3c46b cgls: suppress output of controller name, if it's the systemd one 2015-11-10 17:31:31 +01:00
Lennart Poettering
f499daf4b3 virt: make sure that we detect unknown container managers as VIRTUALIZATION_CONTAINER_OTHER
If we don't know a container manager, we should consider it as "other"
rather than as no container manager at all, to provide a somwhat useful
upgrade path.
2015-11-10 17:31:30 +01:00
Lennart Poettering
fa195fa775 CODING_STYLE: elaborate on usage of C99 fixed size integer types 2015-11-10 17:31:30 +01:00
Lennart Poettering
9905e698b4 man: fix reference to description of time span syntax 2015-11-10 17:31:30 +01:00
Tom Gundersen
8f84882240 Merge pull request #1825 from ssahani/ipv61-1
networkd: add support to configure IPv6 hop limit
2015-11-10 15:03:37 +01:00
Tom Gundersen
3b6a025a4f Merge pull request #1827 from davidreynolds/use_extract_first_word
conf-parser: use extract_first_word
2015-11-10 14:46:53 +01:00
Tom Gundersen
64d4e8f90b Merge pull request #1830 from jsynacek/journalctl-time
man/journalctl: mention systemd.time(7) where appropriate
2015-11-10 14:46:02 +01:00
Tom Gundersen
5af12d8b09 Merge pull request #1831 from keszybz/todo-trimming
Todo trimming
2015-11-10 14:43:42 +01:00
Tom Gundersen
76fba3ca60 Merge pull request #1735 from thom311/master
lldp: avoid compiler warnings in lldp_tfl_package_read* functions
2015-11-10 14:41:35 +01:00
Zbigniew Jędrzejewski-Szmek
9f6434a675 man: describe the reason why runlevels are obsolete
Put it at the top of the file, where it's hard to miss.

Also add the mapping of runlevel → target because since it is now
static.

I'm not adding runlevel(7), because we do not want to make obsolete
stuff even more prominent.
2015-11-10 08:16:08 -05:00
Zbigniew Jędrzejewski-Szmek
28f90ea25f man: tweak description of machinectl show
Also, machinectl status is anything but terse. Remove "terse".
2015-11-10 07:53:43 -05:00
Zbigniew Jędrzejewski-Szmek
474acc9870 TODO: update for lz4/xz stuff
No point in fixing xz now that lz4 is the default.
2015-11-10 07:46:22 -05:00
Jan Synacek
20b2aec031 man/journalctl: mention systemd.time(7) where appropriate
Original bug report: https://bugzilla.redhat.com/show_bug.cgi?id=1182661
2015-11-10 13:05:48 +01:00
David Reynolds
34f253f087 conf-parser: use extract_first_word 2015-11-09 23:57:49 -08:00
Susant Sahani
a86cba89be man: add man for IPV6 hop limit 2015-11-10 09:29:24 +05:30
Susant Sahani
b69c318040 networkd: Add support to configure IPV6 hop limit
This patch adds support to configure IPV6 hop limit.

For example:
/proc/sys/net/ipv6/conf/wlp3s0/hop_limit
2015-11-10 09:26:38 +05:30
Lennart Poettering
b18fc75b07 Merge pull request #1790 from endocode/kayrus/fix_man_kernel_cl
Fixed kernel-command-line links
2015-11-10 01:01:51 +01:00
Tom Gundersen
89c22dc342 Merge pull request #1629 from ssahani/vxlan
networkd: vxlan add option to set FDB entries
2015-11-09 23:36:59 +01:00
Lennart Poettering
64204b9545 Merge pull request #1821 from darkcircle/ko-catalog-translation
l10n: add a new Korean translation for the catalog
2015-11-09 23:19:37 +01:00
Daniel Mack
b0bc8dbd73 Merge pull request #1820 from michich/errno-v2
[v2] treewide: treatment of errno and other cleanups
2015-11-09 21:56:49 +01:00
Seong-ho Cho
decb24f38a add a new Korean translation for the catalog 2015-11-10 05:09:14 +09:00
Lennart Poettering
70d54fca18 Merge pull request #1762 from endocode/dongsu/l10n-ko-msgs
po: update Korean translation
2015-11-09 20:09:49 +01:00
Michal Schmidt
e1427b138f treewide: apply errno.cocci
with small manual cleanups for style.
2015-11-09 20:01:06 +01:00
Michal Schmidt
b3e3bb19a0 coccinelle: additional errno.cocci hunk
rewrites:
  log_error_errno(errno, ...);
  return -errno;
into:
  return log_error_errno(errno, ...);
2015-11-09 20:01:06 +01:00
Michal Schmidt
351825cc73 coccinelle: errno.cocci improvements
Apply to all log_*_errno loglevels.
2015-11-09 20:01:06 +01:00
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