1
0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00
Commit Graph

20816 Commits

Author SHA1 Message Date
Lennart Poettering
0c2c2a3aeb signal-util: modernize and share more code 2015-06-10 01:28:58 +02:00
Lennart Poettering
d93bcf29b8 Merge pull request #126 from phomes/master
core: log oom during killing spree
2015-06-09 23:51:57 +02:00
Thomas Hindoe Paaboel Andersen
60053efbba core: log oom during killing spree
but don't do anything else. We still want to kill as much as
possible.

Coverity CID#996306
2015-06-09 22:07:27 +02:00
Lennart Poettering
135d5bfcae Merge pull request #122 from martinpitt/master
path-util: Fix path_is_mount_point for parent mount points in symlink mode
2015-06-09 20:06:02 +02:00
Martin Pitt
36908eb87d path-util: Fix path_is_mount_point for parent mount points in symlink mode
When we have a structure like this:

  /bin -> /usr/bin
  /usr is a mount point

Then path_is_mount_point("/bin", AT_SYMLINK_FOLLOW) needs to look at the pair
/usr/bin and /usr, not at the pair / and /usr/bin, as the latter have different
mount IDs. But we only want to consider the base name, not any parent.

Thus we have to resolve the given path first to get the real parent when
allowing symlinks.

Bug: https://github.com/systemd/systemd/issues/61
2015-06-09 16:16:56 +02:00
Zbigniew Jędrzejewski-Szmek
236f83afa9 bus-creds: always set SD_BUS_CREDS_PID when we set pid in the mask
Also reorder the code a bit to be easier to parse.
2015-06-09 09:13:35 -04:00
Lennart Poettering
4f7cd56ef2 Merge pull request #121 from martinpitt/master
build-sys: always dist *.policy.in files
2015-06-09 14:31:12 +02:00
Martin Pitt
3712e1249b build-sys: always dist *.policy.in files
Unconditionally dist org.freedesktop.{import1,machine1}.policy.in, like all the
other *.policy.in files. This avoids missing policy files in the tarball.

Spotted by "make distcheck" failure with --disable-importd.
2015-06-09 14:01:06 +02:00
Lennart Poettering
edee1cf626 Merge pull request #111 from phomes/cleanup_warning_suppression
build-sys: don't suppress irrelevant warnings
2015-06-09 11:53:53 +02:00
Kay Sievers
d7684c0f07 Merge pull request #120 from systemd/revert-115-master
Revert "hwdb: actually search /run/udev/hwdb.d"
2015-06-09 11:35:59 +02:00
Lennart Poettering
efbea94798 Revert "hwdb: actually search /run/udev/hwdb.d" 2015-06-09 11:26:06 +02:00
Lennart Poettering
4b955cb9bc Merge pull request #118 from haraldh/set_consume2
util:bind_remount_recursive() fix "use after free" - 2
2015-06-09 11:04:41 +02:00
Lennart Poettering
fd3102491f Merge pull request #77 from haraldh/cryptsetup
cryptsetup: craft a unique ID with the source device
2015-06-09 11:00:31 +02:00
Lennart Poettering
02e55363f1 Merge pull request #116 from utezduyar/feat/async-api-for-method-call
sd-bus: add async convenience method call API
2015-06-09 10:48:32 +02:00
Lennart Poettering
e941c27331 Merge pull request #113 from mezcalero/address-family
networkd: actually always use AddressFamilyBoolean as the bit mask it is
2015-06-09 10:47:04 +02:00
Harald Hoyer
85d834ae8e util:bind_remount_recursive(): handle return 0 of set_consume()
set_consume() does not return -EEXIST, but 0, in case the key is already
in the Set.
2015-06-09 10:32:28 +02:00
Harald Hoyer
f871aeed8b Revert "util:bind_remount_recursive() fix "use after free""
This reverts commit 46be6129d3.
2015-06-09 10:31:14 +02:00
Harald Hoyer
e51b9486d1 cryptsetup: craft a unique ID with the source device
If cryptsetup is called with a source device as argv[3], then craft the
ID for the password agent with a unique device path.

If possible "/dev/block/<maj>:<min>" is used, otherwise the original
argv[3] is used.

This enables password agents like petera [1] to provide a password
according to the source device. The original ID did not carry enough
information and was more targeted for a human readable string, which
is specified in the "Message" field anyway.

With this patch the ID of the ask.XXX ini file looks like this:
ID=cryptsetup:/dev/block/<maj>:<min>

[1] https://github.com/npmccallum/petera
2015-06-09 10:17:55 +02:00
Umut Tezduyar Lindskog
5d941c92bd sd-bus: add async convenience method call API 2015-06-09 08:14:56 +02:00
Martin Pitt
fba3d902b4 Merge pull request #115 from whot/master
hwdb: actually search /run/udev/hwdb.d
2015-06-09 07:19:49 +02:00
Martin Pitt
6f90fe6de6 Merge pull request #114 from crawford/xen
rules: whitelist xvd* devices
2015-06-09 07:15:59 +02:00
Peter Hutterer
5967bda0bc hwdb: add Logitech TrackMan Marble Wheel USB
DPI is guesswork, no specs found on the web and calculating DPIs on a
trackball is tedious.
2015-06-09 14:32:19 +10:00
Peter Hutterer
03dfe7b749 hwdb: actually search /run/udev/hwdb.d
The documentation claims hwdb entries may be placed in the volatile
/run/udev/hwdb.d directory but nothing actually looked at it.
2015-06-09 11:52:10 +10:00
Alex Crawford
bb5c512de2 rules: whitelist xvd* devices
Xen disks need to be whitelisted as well.
2015-06-08 18:22:21 -07:00
Lennart Poettering
e0ee46f290 networkd: actually always use AddressFamilyBoolean as the bit mask it is 2015-06-09 01:21:02 +02:00
Thomas Hindoe Paaboel Andersen
00c11bc53a build-sys: don't suppress irrelevant warnings
We do not trigger these warnings so no need to suppress them.
2015-06-08 23:43:56 +02:00
Lennart Poettering
02776da6ec Merge pull request #108 from phomes/master
tree-wide: remove spurious space
2015-06-08 23:38:27 +02:00
Tom Gundersen
4d1f0021d3 Merge pull request #110 from systemd/revert-41-ipforwarding
Revert "networkd: create "kernel" setting for IPForwarding"
2015-06-08 23:34:11 +02:00
Lennart Poettering
ee0eb1d891 Revert "networkd: create "kernel" setting for IPForwarding" 2015-06-08 23:24:32 +02:00
Thomas Hindoe Paaboel Andersen
920b52e490 tree-wide: remove spurious space 2015-06-08 23:11:26 +02:00
Lennart Poettering
3edf03546d Merge pull request #106 from teg/man-mac-random
man: systemd.link - explain random MAC addresses
2015-06-08 22:44:39 +02:00
Tom Gundersen
2e229e0c4c man: systemd.link - explain random MAC addresses
Two of the bits in the MAC address are set unconditioanlly, and the rest is randomized,
make this clear in the documentation (as it currently read as if it was all random).
2015-06-08 22:30:59 +02:00
Lennart Poettering
8e20f93488 Merge pull request #101 from zonque/kmod
kmod-setup: split warn flags
2015-06-08 20:51:08 +02:00
Daniel Mack
85c675538f kmod-setup: split warn flags
Traditionally, we used to warn about ipv6 being a module or being
unavailable. This was changed in b4aa82f16 ("kmod-setup: don't warn
when ipv6 can't be loaded") in a way that neither of the two conditions
will cause a log message.

Now, while running a setup without any IPv6 is completely fine and
shouldn't cause any warning, we should still warn about ipv6 being a
module instead of built-in.

To achieve this, split the boolean warn flag into two: one for a
feature not being built-in but shipped as a module, and one to
print an error when a module is entirely unavailable.

We will, however, still warn if kmod returns anything else than
-ENOENT in the attempt of loading the module, and at the very least,
turn the message into a debug log.
2015-06-08 20:39:23 +02:00
Lennart Poettering
ca41b679c6 Merge pull request #96 from haraldh/set_consume
util:bind_remount_recursive() fix "use after free"
2015-06-08 19:43:30 +02:00
Harald Hoyer
46be6129d3 util:bind_remount_recursive() fix "use after free"
set_consume(done, x) consumes x with free(x)
but
mount(…, x, …) uses it afterwards.

coverity CID 1299006
2015-06-08 15:14:26 +02:00
Lennart Poettering
1472e65799 Merge pull request #92 from zonque/README
README.md: add Coverity scan status badge
2015-06-08 14:06:32 +02:00
Daniel Mack
609e4fe3af README.md: add Coverity scan status badge 2015-06-08 13:26:54 +02:00
Daniel Hahler
a0ab162a09 zsh-completion: optimize _filter_units_by_property
Optimize _filter_units_by_property by calling `systemctl` only once with
a list of units, and not once per unit.

I could not reproduce the "Unknown unit" error mentioned in a FIXME,
which might have made this necessary previously.
2015-06-06 12:54:41 +02:00
Kay Sievers
7437e0f53a Merge pull request #79 from zonque/fdo-87475
kmod-setup: don't warn when ipv6 can't be loaded (FDO bug #87475)
2015-06-05 21:02:47 +02:00
Daniel Mack
b34fb276c0 Merge pull request #82 from gmacario/bootchart-fix-typo
systemd-bootchart: Trivial typo fix in warning
2015-06-05 21:00:41 +02:00
Gianpaolo Macario
6aec8359b0 systemd-bootchart: Trivial typo fix in warning
Signed-off-by: Gianpaolo Macario <gmacario@gmail.com>
2015-06-05 18:42:36 +02:00
Harald Hoyer
4754345e0f Merge pull request #80 from zonque/README.md
Add README.md
2015-06-05 16:09:45 +02:00
Daniel Mack
7188bb07e3 Add README.md
A README.md allows us to include a badge for the current build status of
Semaphore CI. Keep other information in this file minimal, and avoid
information duplication but point readers to the official README.
2015-06-05 16:01:03 +02:00
David Herrmann
ed47f6397d bus: don't force send-masks on kdbus buses
Right now we always pass KDBUS_ITEM_ATTACH_FLAGS_RECV to
KDBUS_CMD_BUS_MAKE, effectively forcing every bus connection to do the
same during KDBUS_CMD_HELLO. This used to be a workaround to make sure all
metadata is always present. However, we refrained from that approach and
intend to make all metadata collection solely rely on /proc access
restrictions. Therefore, there is no need to force the send-flags mask on
newly created buses.
2015-06-05 15:23:03 +02:00
Daniel Mack
b4aa82f168 kmod-setup: don't warn when ipv6 can't be loaded
Not having IPv6 is a valid setup. Let's not print a warning in that
case.

Addresses:

  https://bugs.freedesktop.org/show_bug.cgi?id=87475
2015-06-05 14:59:36 +02:00
Philip Withnall
7ffeb45cc6 logind: Fix user_elect_display() to be more stable
The previous implementation of user_elect_display() could easily end up
overwriting the user’s valid graphical session with a new TTY session.
For example, consider the situation where there is one session:
   c1, type = SESSION_X11, !stopping, class = SESSION_USER
it is initially elected as the user’s display (i.e. u->display = c1).

If another session is started, on a different VT, the sessions_by_user
list becomes:
   c1, type = SESSION_X11, !stopping, class = SESSION_USER
   c2, type = SESSION_TTY, !stopping, class = SESSION_USER

In the previous code, graphical = c1 and text = c2, as expected.
However, neither graphical nor text fulfil the conditions for setting
u->display = graphical (because neither is better than u->display), so
the code falls through to check the text variable. The conditions for
this match, as u->display->type != SESSION_TTY (it’s actually
SESSION_X11). Hence u->display is set to c2, which is incorrect, because
session c1 is still valid.

Refactor user_elect_display() to use a more explicit filter and
pre-order comparison over the sessions. This can be demonstrated to be
stable and only ever ‘upgrade’ the session to a more graphical one.

https://bugs.freedesktop.org/show_bug.cgi?id=90769
2015-06-05 12:48:16 +02:00
Daniel Mack
3a3701f033 Merge pull request #63 from arvidjaar/issue/50
fstab-generator: cescape device name in root-fsck service
2015-06-05 09:41:27 +02:00
Daniel Mack
a4d9a304f9 Merge pull request #76 from crrodriguez/master
core: Remove "old kernel" warning if PR_SET_CHILD_SUBREAPER fails
2015-06-05 09:25:43 +02:00
Cristian Rodríguez
61b9b203fe core: Remove "old kernel" warning if PR_SET_CHILD_SUBREAPER fails
This made sense when systemd ran on older kernels, nowdays not so much.
2015-06-05 04:06:39 -03:00