diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2015-06-22 17:16:03 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2015-06-22 17:16:03 +0200 |
| commit | 86f210e9c914ba12477d4b2e7fa6f5cfa196a324 (patch) | |
| tree | dce357d070f98e916be8861d669f9127b0719629 /units | |
| parent | e3bff60a6ef3419af32552b54bf19331e59c01c9 (diff) | |
| download | systemd-86f210e9c914ba12477d4b2e7fa6f5cfa196a324.tar.gz | |
Imported Upstream version 221
Diffstat (limited to 'units')
| -rw-r--r-- | units/systemd-networkd.service.m4.in | 2 | ||||
| -rw-r--r-- | units/systemd-resolved.service.m4.in | 2 | ||||
| -rw-r--r-- | units/systemd-udevd.service.in | 1 |
3 files changed, 1 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 diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in index 32f04d901a..e7216d61f2 100644 --- a/units/systemd-udevd.service.in +++ b/units/systemd-udevd.service.in @@ -23,3 +23,4 @@ RestartSec=0 ExecStart=@rootlibexecdir@/systemd-udevd MountFlags=slave KillMode=mixed +WatchdogSec=1min |