]> git.ipfire.org Git - thirdparty/systemd.git/log
thirdparty/systemd.git
8 years agosd-network: allow the state dir to be created after the monitor 148/head
Tom Gundersen [Wed, 10 Jun 2015 17:00:39 +0000 (19:00 +0200)] 
sd-network: allow the state dir to be created after the monitor

We now listen for new subdirs of /run/systemd, and /run/systemd/netif in case
/run/systemd/netif/links does not exist.

8 years agoFix typo
Zbigniew Jędrzejewski-Szmek [Wed, 10 Jun 2015 15:06:00 +0000 (11:06 -0400)] 
Fix typo

Follow up for 7c918141ed.

8 years agoMerge pull request #142 from teg/sd-network-unref-NULL
Lennart Poettering [Wed, 10 Jun 2015 14:59:43 +0000 (16:59 +0200)] 
Merge pull request #142 from teg/sd-network-unref-NULL

sd-network: allow NULL in sd_network_monitor_unref

8 years agoMerge pull request #140 from teg/man-udev-timeout
Daniel Mack [Wed, 10 Jun 2015 14:46:17 +0000 (16:46 +0200)] 
Merge pull request #140 from teg/man-udev-timeout

man: udevd - correct default event timeout

8 years agosd-network: allow NULL in sd_network_monitor_unref 142/head
Tom Gundersen [Wed, 10 Jun 2015 13:55:09 +0000 (15:55 +0200)] 
sd-network: allow NULL in sd_network_monitor_unref

Match rest of codebase, we always allow unref'ing NULL.

8 years agoMerge pull request #85 from keszybz/selinux-context
Zbigniew Jędrzejewski-Szmek [Wed, 10 Jun 2015 14:20:50 +0000 (10:20 -0400)] 
Merge pull request #85 from keszybz/selinux-context

8 years agotest-copy: test copy_bytes()
Zbigniew Jędrzejewski-Szmek [Tue, 2 Jun 2015 16:55:27 +0000 (12:55 -0400)] 
test-copy: test copy_bytes()

8 years agoman: udevd - correct default event timeout 140/head
Tom Gundersen [Tue, 9 Jun 2015 21:56:02 +0000 (23:56 +0200)] 
man: udevd - correct default event timeout

This was changed from 30 to 180 seconds quite some time ago.

8 years agosd-bus: remove ucred parameter from bus_message_from_header() since we don't use...
Lennart Poettering [Wed, 10 Jun 2015 13:52:14 +0000 (15:52 +0200)] 
sd-bus: remove ucred parameter from bus_message_from_header() since we don't use it anymore

8 years agosd-bus: fix early exit when we lack all data in bus_get_owner_creds_dbus1()
Lennart Poettering [Wed, 10 Jun 2015 13:51:40 +0000 (15:51 +0200)] 
sd-bus: fix early exit when we lack all data in bus_get_owner_creds_dbus1()

8 years agobuild-sys: upgrade shadow variable warnings to errors
Lennart Poettering [Wed, 10 Jun 2015 13:44:03 +0000 (15:44 +0200)] 
build-sys: upgrade shadow variable warnings to errors

8 years agobus-message: remove shadow warning with log_debug_bus_message()
Lennart Poettering [Wed, 10 Jun 2015 13:51:14 +0000 (15:51 +0200)] 
bus-message: remove shadow warning with log_debug_bus_message()

8 years agojournald: simplify context handling
Zbigniew Jędrzejewski-Szmek [Sun, 7 Jun 2015 01:36:52 +0000 (21:36 -0400)] 
journald: simplify context handling

By using our homegrown function we can dispense with all the iffdefery.

8 years agosd-bus: store selinux context at connection time
Zbigniew Jędrzejewski-Szmek [Sun, 7 Jun 2015 01:24:45 +0000 (21:24 -0400)] 
sd-bus: store selinux context at connection time

This appears to be the right time to do it for SOCK_STREAM
unix sockets.

Also: condition bus_get_owner_creds_dbus1 was reversed. Split
it out to a separate variable for clarity and fix.

https://bugzilla.redhat.com/show_bug.cgi?id=1224211

8 years agoMerge pull request #132 from ssahani/bond
Lennart Poettering [Wed, 10 Jun 2015 13:10:47 +0000 (15:10 +0200)] 
Merge pull request #132 from ssahani/bond

networkd: bond  improve logging

8 years agoMerge pull request #138 from utezduyar/use-async-convenience-function-on-setting...
Lennart Poettering [Wed, 10 Jun 2015 13:09:03 +0000 (15:09 +0200)] 
Merge pull request #138 from utezduyar/use-async-convenience-function-on-setting-hostname

networkd: use async convenience call to set hostname

8 years agoMerge pull request #133 from ssahani/net
Lennart Poettering [Wed, 10 Jun 2015 13:08:48 +0000 (15:08 +0200)] 
Merge pull request #133 from ssahani/net

networkd: vxlan improve logging

8 years agosd-bus: do not use per-datagram auxiliary information
Zbigniew Jędrzejewski-Szmek [Sat, 6 Jun 2015 22:59:27 +0000 (18:59 -0400)] 
sd-bus: do not use per-datagram auxiliary information

SELinux information cannot be retrieved this way, since we are
using stream unix sockets and SCM_SECURITY does not work for
them.

SCM_CREDENTIALS use dropped to be consistent. We also should
get this information at connection time.

https://bugzilla.redhat.com/show_bug.cgi?id=1224211
"SCM_SECURITY was only added for datagram sockets."

8 years agoMerge pull request #137 from torstehu/correct-typo
Daniel Mack [Wed, 10 Jun 2015 12:21:26 +0000 (14:21 +0200)] 
Merge pull request #137 from torstehu/correct-typo

sd-bus: Correct typo

8 years agonetworkd: use async convenience call to set hostname 138/head
Umut Tezduyar Lindskog [Wed, 10 Jun 2015 11:15:39 +0000 (13:15 +0200)] 
networkd: use async convenience call to set hostname

8 years agosd-bus: Correct typo 137/head
Torstein Husebø [Wed, 10 Jun 2015 11:08:31 +0000 (13:08 +0200)] 
sd-bus: Correct typo

8 years agoMerge pull request #136 from dslul/master
Martin Pitt [Wed, 10 Jun 2015 10:50:35 +0000 (12:50 +0200)] 
Merge pull request #136 from dslul/master

keymap: Add Samsung NP350V and NP670Z

8 years agokeymap: Add Samsung NP350V and NP670Z 136/head
dslul [Wed, 10 Jun 2015 10:18:22 +0000 (12:18 +0200)] 
keymap: Add Samsung NP350V and NP670Z

typo

keymap: Add Samsung NP350V and NP670Z

8 years agoMerge pull request #117 from utezduyar/feat/dump-sync-dbus-message-with-logging-on
Lennart Poettering [Wed, 10 Jun 2015 09:38:12 +0000 (11:38 +0200)] 
Merge pull request #117 from utezduyar/feat/dump-sync-dbus-message-with-logging-on

sd-bus: dump sync messages in debug mode

8 years agoMerge pull request #135 from zonque/buildsys
Lennart Poettering [Wed, 10 Jun 2015 09:27:33 +0000 (11:27 +0200)] 
Merge pull request #135 from zonque/buildsys

build-sys: turn some warnings into errors

8 years agobuild-sys: turn some warnings into errors 135/head
Daniel Mack [Wed, 10 Jun 2015 08:54:59 +0000 (10:54 +0200)] 
build-sys: turn some warnings into errors

Make the build sys error out on missing function prototypes, missing
variable declarations, implicit function declarations or forgotten return
statements.

None of these conditions are acceptable, and by making them hard errors, the
build bots can detect them earlier.

8 years agoMerge pull request #130 from whot/hwdb-updates
Daniel Mack [Wed, 10 Jun 2015 07:43:56 +0000 (09:43 +0200)] 
Merge pull request #130 from whot/hwdb-updates

Hwdb updates

8 years agosd-bus: dump sync messages in debug mode 117/head
Umut Tezduyar Lindskog [Fri, 29 May 2015 07:48:11 +0000 (09:48 +0200)] 
sd-bus: dump sync messages in debug mode

8 years agonetwork: veth imprve logging 133/head
Susant Sahani [Wed, 10 Jun 2015 06:50:45 +0000 (12:20 +0530)] 
network: veth imprve logging

Replaces a lof of strerror() usage with log_netdev_error_errno()

8 years agonetworkd: vxlan improve logging
Susant Sahani [Wed, 10 Jun 2015 06:25:54 +0000 (11:55 +0530)] 
networkd: vxlan improve logging

Replaces a lof of strerror() usage with log_netdev_error_errno()

8 years agonetworkd: bond improve logging 132/head
Susant Sahani [Wed, 10 Jun 2015 06:09:26 +0000 (11:39 +0530)] 
networkd: bond  improve logging

Replaces a lof of strerror() usage with log_netdev_error_errno()

8 years agohwdb: update Logitech's unifying receiver devices 130/head
Peter Hutterer [Wed, 10 Jun 2015 03:53:51 +0000 (13:53 +1000)] 
hwdb: update Logitech's unifying receiver devices

Since 3.19, the devices have the proper vid/pid and the model number in the
name.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
8 years agologind,sd-event: drop spurious new-lines
Lennart Poettering [Tue, 9 Jun 2015 23:27:32 +0000 (01:27 +0200)] 
logind,sd-event: drop spurious new-lines

8 years agotree-wide: whenever we fork off a foreign child process reset signal mask/handlers
Lennart Poettering [Sun, 31 May 2015 21:55:55 +0000 (23:55 +0200)] 
tree-wide: whenever we fork off a foreign child process reset signal mask/handlers

Also, when the child is potentially long-running make sure to set a
death signal.

Also, ignore the result of the reset operations explicitly by casting
them to (void).

8 years agosignal-util: modernize and share more code
Lennart Poettering [Sun, 31 May 2015 21:21:48 +0000 (23:21 +0200)] 
signal-util: modernize and share more code

8 years agoMerge pull request #126 from phomes/master
Lennart Poettering [Tue, 9 Jun 2015 21:51:57 +0000 (23:51 +0200)] 
Merge pull request #126 from phomes/master

core: log oom during killing spree

8 years agocore: log oom during killing spree 126/head
Thomas Hindoe Paaboel Andersen [Tue, 9 Jun 2015 20:03:05 +0000 (22:03 +0200)] 
core: log oom during killing spree

but don't do anything else. We still want to kill as much as
possible.

Coverity CID#996306

8 years agoMerge pull request #122 from martinpitt/master
Lennart Poettering [Tue, 9 Jun 2015 18:06:02 +0000 (20:06 +0200)] 
Merge pull request #122 from martinpitt/master

path-util: Fix path_is_mount_point for parent mount points in symlink mode

8 years agopath-util: Fix path_is_mount_point for parent mount points in symlink mode 122/head
Martin Pitt [Tue, 9 Jun 2015 14:16:56 +0000 (16:16 +0200)] 
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

8 years agobus-creds: always set SD_BUS_CREDS_PID when we set pid in the mask
Zbigniew Jędrzejewski-Szmek [Mon, 25 May 2015 00:20:06 +0000 (20:20 -0400)] 
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.

8 years agoMerge pull request #121 from martinpitt/master
Lennart Poettering [Tue, 9 Jun 2015 12:31:12 +0000 (14:31 +0200)] 
Merge pull request #121 from martinpitt/master

build-sys: always dist *.policy.in files

8 years agobuild-sys: always dist *.policy.in files 121/head
Martin Pitt [Tue, 9 Jun 2015 12:01:06 +0000 (14:01 +0200)] 
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.

8 years agoMerge pull request #111 from phomes/cleanup_warning_suppression
Lennart Poettering [Tue, 9 Jun 2015 09:53:53 +0000 (11:53 +0200)] 
Merge pull request #111 from phomes/cleanup_warning_suppression

build-sys: don't suppress irrelevant warnings

8 years agoMerge pull request #120 from systemd/revert-115-master
Kay Sievers [Tue, 9 Jun 2015 09:35:59 +0000 (11:35 +0200)] 
Merge pull request #120 from systemd/revert-115-master

Revert "hwdb: actually search /run/udev/hwdb.d"

8 years agoRevert "hwdb: actually search /run/udev/hwdb.d" 120/head
Lennart Poettering [Tue, 9 Jun 2015 09:26:06 +0000 (11:26 +0200)] 
Revert "hwdb: actually search /run/udev/hwdb.d"

8 years agoMerge pull request #118 from haraldh/set_consume2
Lennart Poettering [Tue, 9 Jun 2015 09:04:41 +0000 (11:04 +0200)] 
Merge pull request #118 from haraldh/set_consume2

util:bind_remount_recursive() fix "use after free" - 2

8 years agoMerge pull request #77 from haraldh/cryptsetup
Lennart Poettering [Tue, 9 Jun 2015 09:00:31 +0000 (11:00 +0200)] 
Merge pull request #77 from haraldh/cryptsetup

cryptsetup: craft a unique ID with the source device

8 years agoMerge pull request #116 from utezduyar/feat/async-api-for-method-call
Lennart Poettering [Tue, 9 Jun 2015 08:48:32 +0000 (10:48 +0200)] 
Merge pull request #116 from utezduyar/feat/async-api-for-method-call

sd-bus: add async convenience method call API

8 years agoMerge pull request #113 from mezcalero/address-family
Lennart Poettering [Tue, 9 Jun 2015 08:47:04 +0000 (10:47 +0200)] 
Merge pull request #113 from mezcalero/address-family

networkd: actually always use AddressFamilyBoolean as the bit mask it is

8 years agoutil:bind_remount_recursive(): handle return 0 of set_consume() 118/head
Harald Hoyer [Tue, 9 Jun 2015 08:32:28 +0000 (10:32 +0200)] 
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.

8 years agoRevert "util:bind_remount_recursive() fix "use after free""
Harald Hoyer [Tue, 9 Jun 2015 08:31:14 +0000 (10:31 +0200)] 
Revert "util:bind_remount_recursive() fix "use after free""

This reverts commit 46be6129d3e52556eb0f2ae4d07818f9f3f7af7a.

8 years agocryptsetup: craft a unique ID with the source device 77/head
Harald Hoyer [Mon, 1 Jun 2015 15:26:27 +0000 (17:26 +0200)] 
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

8 years agosd-bus: add async convenience method call API 116/head
Umut Tezduyar Lindskog [Mon, 8 Jun 2015 08:00:17 +0000 (10:00 +0200)] 
sd-bus: add async convenience method call API

8 years agoMerge pull request #115 from whot/master
Martin Pitt [Tue, 9 Jun 2015 05:19:49 +0000 (07:19 +0200)] 
Merge pull request #115 from whot/master

hwdb: actually search /run/udev/hwdb.d

8 years agoMerge pull request #114 from crawford/xen
Martin Pitt [Tue, 9 Jun 2015 05:15:59 +0000 (07:15 +0200)] 
Merge pull request #114 from crawford/xen

rules: whitelist xvd* devices

8 years agohwdb: add Logitech TrackMan Marble Wheel USB
Peter Hutterer [Tue, 9 Jun 2015 04:32:19 +0000 (14:32 +1000)] 
hwdb: add Logitech TrackMan Marble Wheel USB

DPI is guesswork, no specs found on the web and calculating DPIs on a
trackball is tedious.

8 years agohwdb: actually search /run/udev/hwdb.d 115/head
Peter Hutterer [Tue, 9 Jun 2015 00:58:06 +0000 (10:58 +1000)] 
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.

8 years agorules: whitelist xvd* devices 114/head
Alex Crawford [Thu, 4 Jun 2015 22:54:35 +0000 (15:54 -0700)] 
rules: whitelist xvd* devices

Xen disks need to be whitelisted as well.

8 years agonetworkd: actually always use AddressFamilyBoolean as the bit mask it is 113/head
Lennart Poettering [Mon, 8 Jun 2015 23:05:34 +0000 (01:05 +0200)] 
networkd: actually always use AddressFamilyBoolean as the bit mask it is

8 years agobuild-sys: don't suppress irrelevant warnings 111/head
Thomas Hindoe Paaboel Andersen [Tue, 2 Jun 2015 20:39:07 +0000 (22:39 +0200)] 
build-sys: don't suppress irrelevant warnings

We do not trigger these warnings so no need to suppress them.

8 years agoMerge pull request #108 from phomes/master
Lennart Poettering [Mon, 8 Jun 2015 21:38:27 +0000 (23:38 +0200)] 
Merge pull request #108 from phomes/master

tree-wide: remove spurious space

8 years agoMerge pull request #110 from systemd/revert-41-ipforwarding
Tom Gundersen [Mon, 8 Jun 2015 21:34:11 +0000 (23:34 +0200)] 
Merge pull request #110 from systemd/revert-41-ipforwarding

Revert "networkd: create "kernel" setting for IPForwarding"

8 years agoRevert "networkd: create "kernel" setting for IPForwarding" 110/head
Lennart Poettering [Mon, 8 Jun 2015 21:24:32 +0000 (23:24 +0200)] 
Revert "networkd: create "kernel" setting for IPForwarding"

8 years agotree-wide: remove spurious space 108/head
Thomas Hindoe Paaboel Andersen [Mon, 8 Jun 2015 18:53:16 +0000 (20:53 +0200)] 
tree-wide: remove spurious space

8 years agoMerge pull request #106 from teg/man-mac-random
Lennart Poettering [Mon, 8 Jun 2015 20:44:39 +0000 (22:44 +0200)] 
Merge pull request #106 from teg/man-mac-random

man: systemd.link - explain random MAC addresses

8 years agoman: systemd.link - explain random MAC addresses 106/head
Tom Gundersen [Mon, 8 Jun 2015 20:30:59 +0000 (22:30 +0200)] 
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).

8 years agoMerge pull request #101 from zonque/kmod
Lennart Poettering [Mon, 8 Jun 2015 18:51:08 +0000 (20:51 +0200)] 
Merge pull request #101 from zonque/kmod

kmod-setup: split warn flags

8 years agokmod-setup: split warn flags 101/head
Daniel Mack [Mon, 8 Jun 2015 16:52:25 +0000 (18:52 +0200)] 
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.

8 years agoMerge pull request #96 from haraldh/set_consume
Lennart Poettering [Mon, 8 Jun 2015 17:43:30 +0000 (19:43 +0200)] 
Merge pull request #96 from haraldh/set_consume

util:bind_remount_recursive() fix "use after free"

8 years agoutil:bind_remount_recursive() fix "use after free" 96/head
Harald Hoyer [Mon, 8 Jun 2015 13:14:26 +0000 (15:14 +0200)] 
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

8 years agoMerge pull request #92 from zonque/README
Lennart Poettering [Mon, 8 Jun 2015 12:06:32 +0000 (14:06 +0200)] 
Merge pull request #92 from zonque/README

README.md: add Coverity scan status badge

8 years agoREADME.md: add Coverity scan status badge 92/head
Daniel Mack [Mon, 8 Jun 2015 11:19:09 +0000 (13:19 +0200)] 
README.md: add Coverity scan status badge

8 years agoMerge pull request #79 from zonque/fdo-87475
Kay Sievers [Fri, 5 Jun 2015 19:02:47 +0000 (21:02 +0200)] 
Merge pull request #79 from zonque/fdo-87475

kmod-setup: don't warn when ipv6 can't be loaded (FDO bug #87475)

8 years agoMerge pull request #82 from gmacario/bootchart-fix-typo
Daniel Mack [Fri, 5 Jun 2015 19:00:41 +0000 (21:00 +0200)] 
Merge pull request #82 from gmacario/bootchart-fix-typo

systemd-bootchart: Trivial typo fix in warning

8 years agosystemd-bootchart: Trivial typo fix in warning 82/head
Gianpaolo Macario [Fri, 5 Jun 2015 16:42:36 +0000 (18:42 +0200)] 
systemd-bootchart: Trivial typo fix in warning

Signed-off-by: Gianpaolo Macario <gmacario@gmail.com>
8 years agoMerge pull request #80 from zonque/README.md
Harald Hoyer [Fri, 5 Jun 2015 14:09:45 +0000 (16:09 +0200)] 
Merge pull request #80 from zonque/README.md

Add README.md

8 years agoAdd README.md 80/head
Daniel Mack [Fri, 5 Jun 2015 12:11:26 +0000 (14:11 +0200)] 
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.

8 years agobus: don't force send-masks on kdbus buses
David Herrmann [Fri, 5 Jun 2015 13:23:03 +0000 (15:23 +0200)] 
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.

8 years agokmod-setup: don't warn when ipv6 can't be loaded 79/head
Daniel Mack [Fri, 5 Jun 2015 12:59:36 +0000 (14:59 +0200)] 
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

8 years agologind: Fix user_elect_display() to be more stable
Philip Withnall [Fri, 29 May 2015 09:49:21 +0000 (10:49 +0100)] 
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

8 years agoMerge pull request #63 from arvidjaar/issue/50
Daniel Mack [Fri, 5 Jun 2015 07:41:27 +0000 (09:41 +0200)] 
Merge pull request #63 from arvidjaar/issue/50

fstab-generator: cescape device name in root-fsck service

8 years agoMerge pull request #76 from crrodriguez/master
Daniel Mack [Fri, 5 Jun 2015 07:25:43 +0000 (09:25 +0200)] 
Merge pull request #76 from crrodriguez/master

core: Remove "old kernel" warning if PR_SET_CHILD_SUBREAPER fails

8 years agocore: Remove "old kernel" warning if PR_SET_CHILD_SUBREAPER fails 76/head
Cristian Rodríguez [Fri, 5 Jun 2015 06:39:02 +0000 (03:39 -0300)] 
core: Remove "old kernel" warning if PR_SET_CHILD_SUBREAPER fails

This made sense when systemd ran on older kernels, nowdays not so much.

8 years agoMerge pull request #74 from systemd-mailing-devs/1432753344-31461-1-git-send-email...
Daniel Mack [Thu, 4 Jun 2015 23:48:25 +0000 (01:48 +0200)] 
Merge pull request #74 from systemd-mailing-devs/1432753344-31461-1-git-send-email-jonathan.boulle@coreos.com

fix extraneous space in equality check

8 years agobus: update kdbus.h
David Herrmann [Thu, 4 Jun 2015 18:26:03 +0000 (20:26 +0200)] 
bus: update kdbus.h

Sync with upstream.

8 years agoMerge pull request #72 from teg/event-fork-unref
David Herrmann [Thu, 4 Jun 2015 17:21:17 +0000 (19:21 +0200)] 
Merge pull request #72 from teg/event-fork-unref

sd-event: don't touch fd's accross forks

8 years agoMerge pull request #73 from zonque/mountinfo
David Herrmann [Thu, 4 Jun 2015 17:15:20 +0000 (19:15 +0200)] 
Merge pull request #73 from zonque/mountinfo

core/mount: skip incomplete mountinfo entries

8 years agosd-event: don't touch fd's accross forks 72/head
Tom Gundersen [Thu, 4 Jun 2015 14:54:45 +0000 (16:54 +0200)] 
sd-event: don't touch fd's accross forks

We protect most of the API from use accross forks, but we still allow both
sd_event and sd_event_source objects to be unref'ed. This would cause
problems as it would unregister sources from the underlying eventfd, hence
also affecting the original instance in the parent process.

This fixes the issue by not touching the fds on unref when done accross a fork,
but still free the memory.

This fixes a regression introduced by
        "udevd: move main-loop to sd-event": 693d371d30fee

where the worker processes were disabling the inotify event source in the
main daemon.

8 years agocore/mount: skip incomplete mountinfo entries 73/head
Daniel Mack [Thu, 4 Jun 2015 13:39:49 +0000 (15:39 +0200)] 
core/mount: skip incomplete mountinfo entries

Skip /proc/mountinfo entries for which libmount returns a NULL pointer
for 'source' or 'target'. This happened on Semaphore CI's build servers
when the test suite is run.

8 years agoMerge pull request #71 from kloun/patch-1
Martin Pitt [Thu, 4 Jun 2015 16:50:03 +0000 (18:50 +0200)] 
Merge pull request #71 from kloun/patch-1

small fix ru translation

8 years agoMerge pull request #58 from pwithnall/wip/pwithnall/user-active-on-vt-switch
David Herrmann [Thu, 4 Jun 2015 14:57:28 +0000 (16:57 +0200)] 
Merge pull request #58 from pwithnall/wip/pwithnall/user-active-on-vt-switch

logind: Save the user’s state when a session enters SESSION_ACTIVE

8 years agosmall fix ru translation 71/head
kloun [Thu, 4 Jun 2015 14:56:59 +0000 (17:56 +0300)] 
small fix ru translation

8 years agoMerge pull request #57 from pwithnall/wip/pwithnall/udev-virtualbox-rules
David Herrmann [Thu, 4 Jun 2015 14:17:24 +0000 (16:17 +0200)] 
Merge pull request #57 from pwithnall/wip/pwithnall/udev-virtualbox-rules

logind: Add a udev rule to tag all DRM cards with master-of-seat

8 years agoPartially revert "ma-setup: simplify"
Zbigniew Jędrzejewski-Szmek [Mon, 1 Jun 2015 14:33:48 +0000 (10:33 -0400)] 
Partially revert "ma-setup: simplify"

copy_bytes() tries to do the write in chunks, but ima kernel code
needs every rule to be written in one write. Writing the whole file
at once avoids the issue.

http://lists.freedesktop.org/archives/systemd-devel/2015-June/032623.html
http://sourceforge.net/p/linux-ima/mailman/message/34145236/
https://bugzilla.redhat.com/show_bug.cgi?id=1226948

8 years agoMerge pull request #68 from whot/hwdb-updates
Martin Pitt [Thu, 4 Jun 2015 06:45:11 +0000 (08:45 +0200)] 
Merge pull request #68 from whot/hwdb-updates

hwdb: add Apple MagicMouse entry

8 years agohwdb: add Apple MagicMouse entry 68/head
Peter Hutterer [Thu, 4 Jun 2015 06:05:08 +0000 (16:05 +1000)] 
hwdb: add Apple MagicMouse entry

8 years agoMerge pull request #59 from eswierk/master
Kay Sievers [Wed, 3 Jun 2015 21:13:40 +0000 (23:13 +0200)] 
Merge pull request #59 from eswierk/master

Add /dev/xvd* to 60-persistent-storage whitelist

8 years agoMerge pull request #65 from teg/enumerate-accept-null
Kay Sievers [Wed, 3 Jun 2015 20:48:01 +0000 (22:48 +0200)] 
Merge pull request #65 from teg/enumerate-accept-null

libudev: enumerate - accept NULL parameters in add_match()

8 years agoMerge pull request #52 from mbiebl/systemctl-edit-default-editor
Tom Gundersen [Wed, 3 Jun 2015 20:34:11 +0000 (22:34 +0200)] 
Merge pull request #52 from mbiebl/systemctl-edit-default-editor

systemctl: Use /usr/bin/editor if available

8 years agokdbus: remove attach_flags_mask module parameter setting
Kay Sievers [Wed, 3 Jun 2015 20:24:16 +0000 (22:24 +0200)] 
kdbus: remove attach_flags_mask module parameter setting