diff options
| author | Kay Sievers <kay@vrfy.org> | 2015-06-17 16:37:55 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2015-06-17 18:01:49 +0200 |
| commit | 1b09f548c7f303b486b5b1321c06336bff72ada4 (patch) | |
| tree | 0fda8c2849b2226ba773dcdc7d7d15132dbac5f6 /units | |
| parent | a54941f1b47507e1609f0d8eb224f5a5a5732c0e (diff) | |
turn kdbus support into a runtime option
./configure --enable/disable-kdbus can be used to set the default
behavior regarding kdbus.
If no kdbus kernel support is available, dbus-dameon will be used.
With --enable-kdbus, the kernel command line option "kdbus=0" can
be used to disable kdbus.
With --disable-kdbus, the kernel command line option "kdbus=1" is
required to enable kdbus support.
Diffstat (limited to 'units')
| -rw-r--r-- | units/systemd-networkd.service.m4.in | 2 | ||||
| -rw-r--r-- | units/systemd-resolved.service.m4.in | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/units/systemd-networkd.service.m4.in b/units/systemd-networkd.service.m4.in index 7f216f331c..64d9130c24 100644 --- a/units/systemd-networkd.service.m4.in +++ b/units/systemd-networkd.service.m4.in @@ -17,13 +17,11 @@ Before=network.target multi-user.target shutdown.target Conflicts=shutdown.target Wants=network.target -m4_ifdef(`ENABLE_KDBUS', # On kdbus systems we pull in the busname explicitly, because it # carries policy that allows the daemon to acquire its name. Wants=org.freedesktop.network1.busname After=org.freedesktop.network1.busname -)m4_dnl [Service] Type=notify Restart=on-failure diff --git a/units/systemd-resolved.service.m4.in b/units/systemd-resolved.service.m4.in index 98ae564af6..dce5402458 100644 --- a/units/systemd-resolved.service.m4.in +++ b/units/systemd-resolved.service.m4.in @@ -10,13 +10,11 @@ Description=Network Name Resolution Documentation=man:systemd-resolved.service(8) After=systemd-networkd.service network.target -m4_ifdef(`ENABLE_KDBUS', # On kdbus systems we pull in the busname explicitly, because it # carries policy that allows the daemon to acquire its name. Wants=org.freedesktop.resolve1.busname After=org.freedesktop.resolve1.busname -)m4_dnl [Service] Type=notify Restart=always |