Package: quagga / 1.2.4-4

0006-Patch-.service-files-for-Debian.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
From: Scott Leggett <scott@sl.id.au>
Date: Sun, 5 Nov 2017 15:11:51 +1100
Subject: Patch .service files for Debian.

---
 redhat/bgpd.service   |  5 ++---
 redhat/isisd.service  |  5 ++---
 redhat/nhrpd.service  |  5 ++---
 redhat/ospf6d.service |  5 ++---
 redhat/ospfd.service  |  5 ++---
 redhat/pimd.service   | 13 +++++++------
 redhat/ripd.service   |  5 ++---
 redhat/ripngd.service |  5 ++---
 redhat/zebra.service  | 10 ++++++----
 9 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/redhat/bgpd.service b/redhat/bgpd.service
index a50bfff..f1ddfd9 100644
--- a/redhat/bgpd.service
+++ b/redhat/bgpd.service
@@ -9,10 +9,9 @@ Documentation=man:bgpd
 
 [Service]
 Type=forking
-EnvironmentFile=/etc/sysconfig/quagga
 ExecStartPre=-/bin/chmod -f 640 /etc/quagga/bgpd.conf
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/bgpd.conf
-ExecStart=/usr/sbin/bgpd -d $BGPD_OPTS -f /etc/quagga/bgpd.conf
+ExecStartPre=-/bin/chown -f quagga:quagga /etc/quagga/bgpd.conf
+ExecStart=/usr/sbin/bgpd -d -A 127.0.0.1 -f /etc/quagga/bgpd.conf
 Restart=on-abort
 
 [Install]
diff --git a/redhat/isisd.service b/redhat/isisd.service
index 93663aa..a16b2f8 100644
--- a/redhat/isisd.service
+++ b/redhat/isisd.service
@@ -9,10 +9,9 @@ Documentation=man:isisd
 
 [Service]
 Type=forking
-EnvironmentFile=/etc/sysconfig/quagga
 ExecStartPre=-/bin/chmod -f 640 /etc/quagga/isisd.conf
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/isisd.conf
-ExecStart=/usr/sbin/isisd -d $ISISD_OPTS -f /etc/quagga/isisd.conf
+ExecStartPre=-/bin/chown -f quagga:quagga /etc/quagga/isisd.conf
+ExecStart=/usr/sbin/isisd -d -A 127.0.0.1 -f /etc/quagga/isisd.conf
 Restart=on-abort
 
 [Install]
diff --git a/redhat/nhrpd.service b/redhat/nhrpd.service
index 5b4120d..15680e8 100644
--- a/redhat/nhrpd.service
+++ b/redhat/nhrpd.service
@@ -9,10 +9,9 @@ Documentation=man:nhrpd
 
 [Service]
 Type=forking
-EnvironmentFile=/etc/sysconfig/quagga
 ExecStartPre=-/bin/chmod -f 640 /etc/quagga/nhrpd.conf
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/nhrpd.conf
-ExecStart=/usr/sbin/nhrpd -d $NHRPD_OPTS -f /etc/quagga/nhrpdd.conf
+ExecStartPre=-/bin/chown -f quagga:quagga /etc/quagga/nhrpd.conf
+ExecStart=/usr/sbin/nhrpd -d -A 127.0.0.1 -f /etc/quagga/nhrpd.conf
 Restart=on-abort
 
 [Install]
diff --git a/redhat/ospf6d.service b/redhat/ospf6d.service
index 3c1c978..c883e5c 100644
--- a/redhat/ospf6d.service
+++ b/redhat/ospf6d.service
@@ -9,10 +9,9 @@ Documentation=man:ospf6d
 
 [Service]
 Type=forking
-EnvironmentFile=/etc/sysconfig/quagga
 ExecStartPre=-/bin/chmod -f 640 /etc/quagga/ospf6d.conf
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/ospf6d.conf
-ExecStart=/usr/sbin/ospf6d -d $OSPF6D_OPTS -f /etc/quagga/ospf6d.conf
+ExecStartPre=-/bin/chown -f quagga:quagga /etc/quagga/ospf6d.conf
+ExecStart=/usr/sbin/ospf6d -d -A ::1 -f /etc/quagga/ospf6d.conf
 Restart=on-abort
 
 [Install]
diff --git a/redhat/ospfd.service b/redhat/ospfd.service
index 0084b6c..57b3bee 100644
--- a/redhat/ospfd.service
+++ b/redhat/ospfd.service
@@ -9,10 +9,9 @@ Documentation=man:ospfd
 
 [Service]
 Type=forking
-EnvironmentFile=/etc/sysconfig/quagga
 ExecStartPre=-/bin/chmod -f 640 /etc/quagga/ospfd.conf
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/ospfd.conf
-ExecStart=/usr/sbin/ospfd -d $OSPFD_OPTS -f /etc/quagga/ospfd.conf
+ExecStartPre=-/bin/chown -f quagga:quagga /etc/quagga/ospfd.conf
+ExecStart=/usr/sbin/ospfd -d -A 127.0.0.1 -f /etc/quagga/ospfd.conf
 Restart=on-abort
 
 [Install]
diff --git a/redhat/pimd.service b/redhat/pimd.service
index 1916846..b2d33f3 100644
--- a/redhat/pimd.service
+++ b/redhat/pimd.service
@@ -1,17 +1,18 @@
 [Unit]
 Description=PIM multicast routing engine
-BindTo=zebra.service
-After=syslog.target network.target zebra.service
+BindsTo=zebra.service
+Wants=network.target
+After=zebra.service network-pre.target
+Before=network.target
 ConditionPathExists=/etc/quagga/pimd.conf
 Documentation=man:pimd
 
 [Service]
 Type=forking
-EnvironmentFile=/etc/sysconfig/quagga
 ExecStartPre=-/bin/chmod -f 640 /etc/quagga/pimd.conf
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/pimd.conf
-ExecStart=/usr/sbin/pimd -d $PIMD_OPTS -f /etc/quagga/pimd.conf
+ExecStartPre=-/bin/chown -f quagga:quagga /etc/quagga/pimd.conf
+ExecStart=/usr/sbin/pimd -d -A 127.0.0.1 -f /etc/quagga/pimd.conf
 Restart=on-abort
 
 [Install]
-WantedBy=network.target
+WantedBy=multi-user.target
diff --git a/redhat/ripd.service b/redhat/ripd.service
index 103b5a9..d6290e0 100644
--- a/redhat/ripd.service
+++ b/redhat/ripd.service
@@ -9,10 +9,9 @@ Documentation=man:ripd
 
 [Service]
 Type=forking
-EnvironmentFile=/etc/sysconfig/quagga
 ExecStartPre=-/bin/chmod -f 640 /etc/quagga/ripd.conf
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/ripd.conf
-ExecStart=/usr/sbin/ripd -d $RIPD_OPTS -f /etc/quagga/ripd.conf
+ExecStartPre=-/bin/chown -f quagga:quagga /etc/quagga/ripd.conf
+ExecStart=/usr/sbin/ripd -d -A 127.0.0.1 -f /etc/quagga/ripd.conf
 Restart=on-abort
 
 [Install]
diff --git a/redhat/ripngd.service b/redhat/ripngd.service
index 6fe6ba8..2e4ccb8 100644
--- a/redhat/ripngd.service
+++ b/redhat/ripngd.service
@@ -9,10 +9,9 @@ Documentation=man:ripngd
 
 [Service]
 Type=forking
-EnvironmentFile=/etc/sysconfig/quagga
 ExecStartPre=-/bin/chmod -f 640 /etc/quagga/ripngd.conf
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/ripngd.conf
-ExecStart=/usr/sbin/ripngd -d $RIPNGD_OPTS -f /etc/quagga/ripngd.conf
+ExecStartPre=-/bin/chown -f quagga:quagga /etc/quagga/ripngd.conf
+ExecStart=/usr/sbin/ripngd -d -A ::1 -f /etc/quagga/ripngd.conf
 Restart=on-abort
 
 [Install]
diff --git a/redhat/zebra.service b/redhat/zebra.service
index fa5a004..5111677 100644
--- a/redhat/zebra.service
+++ b/redhat/zebra.service
@@ -8,13 +8,15 @@ Documentation=man:zebra
 
 [Service]
 Type=forking
-EnvironmentFile=-/etc/sysconfig/quagga
 ExecStartPre=/sbin/ip route flush proto zebra
 ExecStartPre=-/bin/chmod -f 640 /etc/quagga/vtysh.conf /etc/quagga/zebra.conf
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /run/quagga /etc/quagga/zebra.conf
-ExecStartPre=-/bin/chown -f ${QUAGGA_USER}${VTY_GROUP:+":$VTY_GROUP"} quaggavty /etc/quagga/vtysh.conf
-ExecStart=/usr/sbin/zebra -d $ZEBRA_OPTS -f /etc/quagga/zebra.conf
+ExecStartPre=-/bin/chown -f quagga:quagga /etc/quagga/zebra.conf
+ExecStartPre=-/bin/chown -f quagga:quaggavty /etc/quagga/vtysh.conf
+ExecStart=/usr/sbin/zebra -d -A 127.0.0.1 -f /etc/quagga/zebra.conf
 Restart=on-abort
+RuntimeDirectory=quagga
+RuntimeDirectoryMode=775
+Group=quagga
 
 [Install]
 WantedBy=multi-user.target