|
 |
fe94d73 |
From 318afd68d26818eff24b3dfe94fa01b8dad873eb Mon Sep 17 00:00:00 2001
|
|
|
fe94d73 |
From: Michal Sekletar <msekleta@redhat.com>
|
|
|
fe94d73 |
Date: Tue, 11 Jun 2013 19:17:09 +0200
|
|
|
fe94d73 |
Subject: [PATCH] systemd: change the WantedBy target
|
|
|
fe94d73 |
|
|
|
fe94d73 |
Previously with configuration WantedBy=network.target it could happen
|
|
|
fe94d73 |
that after enabling let's say zebra and bgpd and restarting the server
|
|
|
fe94d73 |
services won't be started. In case when no service pulls in
|
|
|
fe94d73 |
network.target quagga daemons won't start, because they are enabled
|
|
|
fe94d73 |
under network.target. This might be the case when only zebra is used
|
|
|
fe94d73 |
for configuring interfaces and other services like NM and initscripts
|
|
|
fe94d73 |
are disabled.
|
|
|
fe94d73 |
|
|
|
fe94d73 |
This commit also removes ordering dependency on syslog.target, since
|
|
|
fe94d73 |
this is redundant these days, because systemd-journald is early boot
|
|
|
fe94d73 |
service.
|
|
|
fe94d73 |
---
|
|
|
fe94d73 |
redhat/babeld.service | 4 ++--
|
|
|
fe94d73 |
redhat/bgpd.service | 4 ++--
|
|
|
fe94d73 |
redhat/isisd.service | 4 ++--
|
|
|
fe94d73 |
redhat/ospf6d.service | 4 ++--
|
|
|
fe94d73 |
redhat/ospfd.service | 4 ++--
|
|
|
fe94d73 |
redhat/ripd.service | 4 ++--
|
|
|
fe94d73 |
redhat/ripngd.service | 4 ++--
|
|
|
fe94d73 |
redhat/zebra.service | 5 +++--
|
|
|
fe94d73 |
8 files changed, 17 insertions(+), 16 deletions(-)
|
|
|
fe94d73 |
|
|
|
fe94d73 |
diff --git a/redhat/babeld.service b/redhat/babeld.service
|
|
|
fe94d73 |
index b1ea943..2182de7 100644
|
|
|
fe94d73 |
--- a/redhat/babeld.service
|
|
|
fe94d73 |
+++ b/redhat/babeld.service
|
|
|
fe94d73 |
@@ -1,7 +1,7 @@
|
|
|
fe94d73 |
[Unit]
|
|
|
fe94d73 |
Description=Babel routing daemon
|
|
|
fe94d73 |
BindTo=zebra.service
|
|
|
fe94d73 |
-After=syslog.target network.target zebra.service
|
|
|
fe94d73 |
+After=zebra.service
|
|
|
fe94d73 |
ConditionPathExists=/etc/quagga/babeld.conf
|
|
|
fe94d73 |
|
|
|
fe94d73 |
[Service]
|
|
|
fe94d73 |
@@ -11,4 +11,4 @@ ExecStart=/usr/sbin/babeld -d $BABELD_OPTS -f /etc/quagga/babeld.conf
|
|
|
fe94d73 |
Restart=on-abort
|
|
|
fe94d73 |
|
|
|
fe94d73 |
[Install]
|
|
|
fe94d73 |
-WantedBy=network.target
|
|
|
fe94d73 |
+WantedBy=multi-user.target
|
|
|
fe94d73 |
diff --git a/redhat/bgpd.service b/redhat/bgpd.service
|
|
|
fe94d73 |
index 5040284..b48a053 100644
|
|
|
fe94d73 |
--- a/redhat/bgpd.service
|
|
|
fe94d73 |
+++ b/redhat/bgpd.service
|
|
|
fe94d73 |
@@ -1,7 +1,7 @@
|
|
|
fe94d73 |
[Unit]
|
|
|
fe94d73 |
Description=BGP routing daemon
|
|
|
fe94d73 |
BindTo=zebra.service
|
|
|
fe94d73 |
-After=syslog.target network.target zebra.service
|
|
|
fe94d73 |
+After=zebra.service
|
|
|
fe94d73 |
ConditionPathExists=/etc/quagga/bgpd.conf
|
|
|
fe94d73 |
|
|
|
fe94d73 |
[Service]
|
|
|
fe94d73 |
@@ -11,4 +11,4 @@ ExecStart=/usr/sbin/bgpd -d $BGPD_OPTS -f /etc/quagga/bgpd.conf
|
|
|
fe94d73 |
Restart=on-abort
|
|
|
fe94d73 |
|
|
|
fe94d73 |
[Install]
|
|
|
fe94d73 |
-WantedBy=network.target
|
|
|
fe94d73 |
+WantedBy=multi-user.target
|
|
|
fe94d73 |
diff --git a/redhat/isisd.service b/redhat/isisd.service
|
|
|
fe94d73 |
index 4cdf67d..d5c2438 100644
|
|
|
fe94d73 |
--- a/redhat/isisd.service
|
|
|
fe94d73 |
+++ b/redhat/isisd.service
|
|
|
fe94d73 |
@@ -1,7 +1,7 @@
|
|
|
fe94d73 |
[Unit]
|
|
|
fe94d73 |
Description=IS-IS routing daemon
|
|
|
fe94d73 |
BindTo=zebra.service
|
|
|
fe94d73 |
-After=syslog.target network.target zebra.service
|
|
|
fe94d73 |
+After=zebra.service
|
|
|
fe94d73 |
ConditionPathExists=/etc/quagga/isisd.conf
|
|
|
fe94d73 |
|
|
|
fe94d73 |
[Service]
|
|
|
fe94d73 |
@@ -11,4 +11,4 @@ ExecStart=/usr/sbin/isisd -d $ISISD_OPTS -f /etc/quagga/isisd.conf
|
|
|
fe94d73 |
Restart=on-abort
|
|
|
fe94d73 |
|
|
|
fe94d73 |
[Install]
|
|
|
fe94d73 |
-WantedBy=network.target
|
|
|
fe94d73 |
+WantedBy=multi-user.target
|
|
|
fe94d73 |
diff --git a/redhat/ospf6d.service b/redhat/ospf6d.service
|
|
|
fe94d73 |
index 3c9c466..f9759f5 100644
|
|
|
fe94d73 |
--- a/redhat/ospf6d.service
|
|
|
fe94d73 |
+++ b/redhat/ospf6d.service
|
|
|
fe94d73 |
@@ -1,7 +1,7 @@
|
|
|
fe94d73 |
[Unit]
|
|
|
fe94d73 |
Description=OSPF routing daemon for IPv6
|
|
|
fe94d73 |
BindTo=zebra.service
|
|
|
fe94d73 |
-After=syslog.target network.target zebra.service
|
|
|
fe94d73 |
+After=zebra.service
|
|
|
fe94d73 |
ConditionPathExists=/etc/quagga/ospf6d.conf
|
|
|
fe94d73 |
|
|
|
fe94d73 |
[Service]
|
|
|
fe94d73 |
@@ -11,4 +11,4 @@ ExecStart=/usr/sbin/ospf6d -d $OSPF6D_OPTS -f /etc/quagga/ospf6d.conf
|
|
|
fe94d73 |
Restart=on-abort
|
|
|
fe94d73 |
|
|
|
fe94d73 |
[Install]
|
|
|
fe94d73 |
-WantedBy=network.target
|
|
|
fe94d73 |
+WantedBy=multi-user.target
|
|
|
fe94d73 |
diff --git a/redhat/ospfd.service b/redhat/ospfd.service
|
|
|
fe94d73 |
index 5e3de23..c2887e7 100644
|
|
|
fe94d73 |
--- a/redhat/ospfd.service
|
|
|
fe94d73 |
+++ b/redhat/ospfd.service
|
|
|
fe94d73 |
@@ -1,7 +1,7 @@
|
|
|
fe94d73 |
[Unit]
|
|
|
fe94d73 |
Description=OSPF routing daemon
|
|
|
fe94d73 |
BindTo=zebra.service
|
|
|
fe94d73 |
-After=syslog.target network.target zebra.service
|
|
|
fe94d73 |
+After=zebra.service
|
|
|
fe94d73 |
ConditionPathExists=/etc/quagga/ospfd.conf
|
|
|
fe94d73 |
|
|
|
fe94d73 |
[Service]
|
|
|
fe94d73 |
@@ -11,4 +11,4 @@ ExecStart=/usr/sbin/ospfd -d $OSPFD_OPTS -f /etc/quagga/ospfd.conf
|
|
|
fe94d73 |
Restart=on-abort
|
|
|
fe94d73 |
|
|
|
fe94d73 |
[Install]
|
|
|
fe94d73 |
-WantedBy=network.target
|
|
|
fe94d73 |
+WantedBy=multi-user.target
|
|
|
fe94d73 |
diff --git a/redhat/ripd.service b/redhat/ripd.service
|
|
|
fe94d73 |
index d35dc47..cc4142a 100644
|
|
|
fe94d73 |
--- a/redhat/ripd.service
|
|
|
fe94d73 |
+++ b/redhat/ripd.service
|
|
|
fe94d73 |
@@ -1,7 +1,7 @@
|
|
|
fe94d73 |
[Unit]
|
|
|
fe94d73 |
Description=RIP routing daemon
|
|
|
fe94d73 |
BindTo=zebra.service
|
|
|
fe94d73 |
-After=syslog.target network.target zebra.service
|
|
|
fe94d73 |
+After=zebra.service
|
|
|
fe94d73 |
ConditionPathExists=/etc/quagga/ripd.conf
|
|
|
fe94d73 |
|
|
|
fe94d73 |
[Service]
|
|
|
fe94d73 |
@@ -11,4 +11,4 @@ ExecStart=/usr/sbin/ripd -d $RIPD_OPTS -f /etc/quagga/ripd.conf
|
|
|
fe94d73 |
Restart=on-abort
|
|
|
fe94d73 |
|
|
|
fe94d73 |
[Install]
|
|
|
fe94d73 |
-WantedBy=network.target
|
|
|
fe94d73 |
+WantedBy=multi-user.target
|
|
|
fe94d73 |
diff --git a/redhat/ripngd.service b/redhat/ripngd.service
|
|
|
fe94d73 |
index 567e888..35365e7 100644
|
|
|
fe94d73 |
--- a/redhat/ripngd.service
|
|
|
fe94d73 |
+++ b/redhat/ripngd.service
|
|
|
fe94d73 |
@@ -1,7 +1,7 @@
|
|
|
fe94d73 |
[Unit]
|
|
|
fe94d73 |
Description=RIP routing daemon for IPv6
|
|
|
fe94d73 |
BindTo=zebra.service
|
|
|
fe94d73 |
-After=syslog.target network.target zebra.service
|
|
|
fe94d73 |
+After=zebra.service
|
|
|
fe94d73 |
ConditionPathExists=/etc/quagga/ripngd.conf
|
|
|
fe94d73 |
|
|
|
fe94d73 |
[Service]
|
|
|
fe94d73 |
@@ -11,4 +11,4 @@ ExecStart=/usr/sbin/ripngd -d $RIPNGD_OPTS -f /etc/quagga/ripngd.conf
|
|
|
fe94d73 |
Restart=on-abort
|
|
|
fe94d73 |
|
|
|
fe94d73 |
[Install]
|
|
|
fe94d73 |
-WantedBy=network.target
|
|
|
fe94d73 |
+WantedBy=multi-user.target
|
|
|
fe94d73 |
diff --git a/redhat/zebra.service b/redhat/zebra.service
|
|
|
fe94d73 |
index 27c3a52..5b9e454 100644
|
|
|
fe94d73 |
--- a/redhat/zebra.service
|
|
|
fe94d73 |
+++ b/redhat/zebra.service
|
|
|
fe94d73 |
@@ -1,6 +1,7 @@
|
|
|
fe94d73 |
[Unit]
|
|
|
fe94d73 |
Description=GNU Zebra routing manager
|
|
|
fe94d73 |
-After=syslog.target network.target
|
|
|
fe94d73 |
+Wants=network.target
|
|
|
fe94d73 |
+Before=network.target
|
|
|
fe94d73 |
ConditionPathExists=/etc/quagga/zebra.conf
|
|
|
fe94d73 |
|
|
|
fe94d73 |
[Service]
|
|
|
fe94d73 |
@@ -11,4 +12,4 @@ ExecStart=/usr/sbin/zebra -d $ZEBRA_OPTS -f /etc/quagga/zebra.conf
|
|
|
fe94d73 |
Restart=on-abort
|
|
|
fe94d73 |
|
|
|
fe94d73 |
[Install]
|
|
|
fe94d73 |
-WantedBy=network.target
|
|
|
fe94d73 |
+WantedBy=multi-user.target
|
|
|
fe94d73 |
--
|
|
|
fe94d73 |
1.8.1.4
|
|
|
fe94d73 |
|