1
0
mirror of https://github.com/systemd/systemd.git synced 2024-11-14 15:21:37 +03:00
Commit Graph

5999 Commits

Author SHA1 Message Date
Lennart Poettering
cde93897cd event: hook up sd-event with the service watchdog logic
Adds a new call sd_event_set_watchdog() that can be used to hook up the
event loop with the watchdog supervision logic of systemd. If enabled
and $WATCHDOG_USEC is set the event loop will ping the invoking systemd
daemon right after coming back from epoll_wait() but not more often than
$WATCHDOG_USEC/4. The epoll_wait() will sleep no longer than
$WATCHDOG_USEC/4*3, to make sure the service manager is called in time.

This means that setting WatchdogSec= in a .service file and calling
sd_event_set_watchdog() in your daemon is enough to hook it up with the
watchdog logic.
2013-12-11 18:20:09 +01:00
Lennart Poettering
08cd155254 event: when handling SIGCHLD of a child process only reap after dispatching event source
That way the even source callback is run with the zombie process still
around so that it can access /proc/$PID/ and similar, and so that it can
be sure that the PID has not been reused yet.
2013-12-11 18:20:09 +01:00
Kay Sievers
e599ba01f5 bus: kdbus - skip only STARTER and IN_QUEUE names for NameOwnerChanged 2013-12-11 05:38:25 +01:00
Zbigniew Jędrzejewski-Szmek
c099716487 activate: clean up inherited descriptors
> [simon@troela server]$ /usr/lib/systemd/systemd-activate -l 9000 main.js
> Assertion 'fd == 3 + count' failed at src/activate/activate.c:115,
> function open_sockets(). Aborting.
> Aborted (core dumped)

> after a bit debuging i found the problem:
> slim appears to leak an fd into all of its children:
> stat /proc/14004/fd/3  (14004 is the pid a random process in my session)
>  File: '/proc/14004/fd/3' -> '/var/log/slim.log'

systemd-activate should be robust against the shell (or anything else) leaking
descriptors. Now everything except stdin/stdout/stderr and received sockets
will be closed.
2013-12-10 21:52:57 -05:00
Zbigniew Jędrzejewski-Szmek
e3bfb7be07 journald: malloc less when streaming messages 2013-12-10 20:38:33 -05:00
Luke Shumaker
90d14d2015 ptyfwd: Don't set the output prop of stdin, nor the input props of stdout.
It was calling cfmakeraw(3) on the properties for STDIN_FILENO; cfmakeraw
sets both input and output properties.  If (and only if) stdin and stdout
are the same device is this correct.  Otherwise, we must change only the
input properties of stdin, and only the output properties of stdout.
2013-12-11 01:04:21 +00:00
Luke Shumaker
eaf73b0616 ptyfwd: Set the size of the PTY base on the size of stdout, not stdin. 2013-12-11 01:01:40 +00:00
David Herrmann
559a4d4cda core: fix Unit.SetProperties argument parsing
SetProperties has signature "ba(sv)", but the bus_unit_set_properties()
helper already does a enter_container('a', "sv") so we have to skip it in
bus_unit_method_set_properties().
2013-12-10 23:28:07 +00:00
Lennart Poettering
f820cf99c1 bus: do not dispatch incoming method calls that are broacasted to vtables 2013-12-10 23:11:10 +00:00
Lennart Poettering
a82cafb97b bus: don't generate assert warnings when we detach a detached bus from an event 2013-12-10 23:06:50 +00:00
Shawn Landden
9a636ed809 core: epoll and signalfd has been moved into sd event loop 2013-12-10 22:50:29 +00:00
Thomas Hindoe Paaboel Andersen
96115cdfe0 fix scan-build issues
The static analyzer scan-build had a few issues with analysing
parts of systemd.

gpt-auto-generator.c:
scan-build could not find blkid.h. Whether it should be blkid.h or
blkid/blkid.h seems to depend on the version used. We already use
blkid/blkid.h in udev-builtin-blkid.c so it seems safe to use that
here too.

Makefile.am:
Moved some -D's from CFLAGS to CPPFLAGS. I also simplified them a
bit and got rid of a left over DBUS_CFLAGS.

test-cgroup-mask.c/test-sched-prio.c
A variable was added to store the replaced TEST_DIR. When wrapped
in an assert_se TEST_DIR was not replaced in the logged error.
While not an issue introduced in this patch we might as well fix
it up while we are here.
2013-12-10 22:30:46 +01:00
Lennart Poettering
ff4994c507 bus: generate debug messages when we cannot deliver messages via kdbus 2013-12-10 20:38:51 +00:00
Lennart Poettering
5b1bc83f81 bus: when we _unref() a NULL pointer, don't use assert_return()
We support unreffing NULL pointers just fine and we shouldn't pay the
_unlikely_() price for it, not get a debug message if we do, hence let's
not use assert_return() here.
2013-12-10 20:38:04 +00:00
Lukasz Skalski
c8fa3f6030 bus: Add bus_kernel_monitor function 2013-12-10 20:32:20 +00:00
Lennart Poettering
65a6df56f1 hashmap: make gcc shut up on old glibcs that lack getauxval() 2013-12-10 19:52:16 +00:00
Lennart Poettering
14c1025934 journald: use a bit more cleanup magic! 2013-12-10 19:51:47 +00:00
Lennart Poettering
35460afc48 Revert "libsystemd-bus: use assert_return"
This reverts commit f7e2bd5a80.

Most of these checks are not programming errors, but happen during
normal runtime. For example bus_kernel_pop_memfd() is called all the
time on non-kdbus systems and is supposed to quickly fail if kdbus is
not available. However, assert_return() makes this failure
expensive, and hence has no place here. With the most recent change to
assert_return() it will even log a debug message, which should never
happen here.
2013-12-10 19:31:10 +00:00
Lennart Poettering
ecad10fe4a Revert "systemd: add a start job for all units in SYSTEMD_[USER_]WANTS="
This reverts commit e775289d56.

We really should let the dependency logic add jobs for dependencies here
rather than manually adding in jobs, overtaping the real problem.
2013-12-10 18:53:56 +00:00
Lennart Poettering
98088803bb util: check for overflow in greedy_realloc() 2013-12-10 18:53:56 +00:00
Kay Sievers
e77f18939b bus: update kdbus.h 2013-12-10 19:26:51 +01:00
Shawn Landden
145b1f799f core/manager: remove infinite loop 2013-12-10 18:08:25 +00:00
Lennart Poettering
80514f9c9b macro: log assertion at debug level in assert_return() 2013-12-10 17:01:10 +00:00
Lennart Poettering
6e8df5f00a bus: introduce new SD_BUS_VTABLE_HIDDEN flag for vtable members
When this flag is set then its member will not be shown in the
introspection data. Also, properties with this flag set will not be
included in GetAll() responses.
2013-12-10 16:52:49 +00:00
Lennart Poettering
adacb9575a bus: introduce "trusted" bus concept and encode access control in object vtables
Introduces a new concept of "trusted" vs. "untrusted" busses. For the
latter libsystemd-bus will automatically do per-method access control,
for the former all access is automatically granted. Per-method access
control is encoded in the vtables: by default all methods are only
accessible to privileged clients. If the SD_BUS_VTABLE_UNPRIVILEGED flag
is set for a method it is accessible to unprivileged clients too. By
default whether a client is privileged is determined via checking for
its CAP_SYS_ADMIN capability, but this can be altered via the
SD_BUS_VTABLE_CAPABILITY() macro that can be ORed into the flags field
of the method.

Writable properties are also subject to SD_BUS_VTABLE_UNPRIVILEGED and
SD_BUS_VTABLE_CAPABILITY() for controlling write access to them. Note
however that read access is unrestricted, as PropertiesChanged messages
might send out the values anyway as an unrestricted broadcast.

By default the system bus is set to "untrusted" and the user bus is
"trusted" since per-method access control on the latter is unnecessary.

On dbus1 busses we check the UID of the caller rather than the
configured capability since the capability cannot be determined without
race. On kdbus the capability is checked if possible from the attached
meta-data of a message and otherwise queried from the sending peer.

This also decorates the vtables of the various daemons we ship with
these flags.
2013-12-10 16:52:49 +00:00
Kay Sievers
85719154e7 libudev: hwdb - use libudev not systemd logging 2013-12-10 16:37:26 +01:00
Dan McGee
4987623d01 Bring bootchart code in line with CODING_STYLE
Use double and not float, as there is little to no benefit.
2013-12-10 07:40:55 -05:00
Dan McGee
2d43b19090 Ensure unit is journaled for short-lived or oneshot processes
In the time it takes to process incoming log messages, the process we
are logging details for may exit. This means the cgroup data is no
longer available from '/proc'. Unfortunately, the way the code was
structured before, we never log _SYSTEMD_UNIT if we don't have this
cgroup information.

Add an else if case that allows the passed in unit_id to be logged even
if we couldn't capture cgroup information. This ensures a command like
`journalctl -u run-XXX` will return all log messages from a oneshot
process.
2013-12-10 07:40:55 -05:00
Adam Williamson
18c92a4958 correct name of Tajik kbd layout in kbd-model-map 2013-12-10 05:16:46 -05:00
Adam Williamson
70dc36d17f drop several entries from kbd-model-map whose kbd layouts do not exist
kbd-model-map was generated from system-config-keyboard's keyboard_models.py.
Several of the kbd layouts referred in that file do not exist and, so far as I
can tell, never did. I believe these entries existed simply to provide the xkb
configuration information for those layouts, and there never were matching kbd
entries; the kbd names were entirely notional, to satisfy the need for some
entry or other in that field.

For systemd, the only function of kbd-model-map is to 'match' kbd and xkb
configurations, so it does not make any sense to maintain entries for cases
where only one or the other exists in this context.
2013-12-10 05:16:46 -05:00
Lukasz Skalski
f7e2bd5a80 libsystemd-bus: use assert_return 2013-12-09 23:27:19 -05:00
Sébastien Luttringer
d838db0d3b kernel-install: fix help output
Kernel install doesn't need the second argument on his command line when
removing.
This is correctly documented in the man page.
2013-12-09 23:19:16 -05:00
Lennart Poettering
5877dc5a7f test: add gvariant test for empty messages 2013-12-10 03:31:52 +01:00
Lennart Poettering
5f7e8903b2 bus: properly handle empty messages 2013-12-10 03:30:51 +01:00
Lennart Poettering
224a1ed4c1 bus: empty gvariant arrays should at least get size 1 2013-12-10 03:04:16 +01:00
Lennart Poettering
041b85cf01 bus: it's OK to send messages with an empty payload but non-empty signature
THis might happen when sending arrays with 0 enttries, hence this is not
an indication for a problem.
2013-12-10 02:57:46 +01:00
Lennart Poettering
9bb59c29f0 bus: update kdbus.h 2013-12-10 02:33:33 +01:00
Lennart Poettering
8f2e44f820 bus: make gcc shut up 2013-12-10 02:33:13 +01:00
Lennart Poettering
72d87e6519 bus: beef up zero copy test case 2013-12-10 01:07:32 +01:00
Lennart Poettering
e1d337d462 bus: only accept gvariant native endian messages via kdbus 2013-12-10 01:07:09 +01:00
Lennart Poettering
d36b703136 bus: fix rewinding in gvariant messages 2013-12-10 01:06:52 +01:00
Lennart Poettering
5763192abf bus: fix signature handling when exiting container 2013-12-10 01:06:29 +01:00
Lennart Poettering
0039a203b1 bus: properly deserialize gvariant fixed size arrays 2013-12-10 01:05:23 +01:00
Lennart Poettering
d63850688d bus: handler empty messages correctly when using gvariant marshalling 2013-12-10 01:04:36 +01:00
Lennart Poettering
f30976971c bus: suppress creating empty parts in messages 2013-12-10 01:03:41 +01:00
Lennart Poettering
18f5b48f3f bus: rely on explicit eof check instead of checking when mapping payload
This allows us to drop quite a bit of code.
2013-12-09 23:24:17 +01:00
Lennart Poettering
813892259b bus: rearrange bus-message.c function order to keep read and write calls together 2013-12-09 23:16:14 +01:00
Lennart Poettering
6647dc6659 bus: demarshal gvariant 2013-12-09 23:04:49 +01:00
Zbigniew Jędrzejewski-Szmek
04504f93d1 systemctl: fix 'is-enabled' 2013-12-08 19:26:51 -05:00
Zbigniew Jędrzejewski-Szmek
d08e75edf9 systemctl: simplify argument parsing 2013-12-08 19:26:51 -05:00