|
 |
5705b1b |
From: Michal Ruprich <mruprich@redhat.com>
|
|
|
5705b1b |
diff --git a/redhat/bgpd.service b/redhat/bgpd.service
|
|
|
5705b1b |
index a50bfff..2eda1b8 100644
|
|
|
5705b1b |
--- a/redhat/bgpd.service
|
|
|
5705b1b |
+++ b/redhat/bgpd.service
|
|
|
5705b1b |
@@ -11,7 +11,7 @@ Documentation=man:bgpd
|
|
|
5705b1b |
Type=forking
|
|
|
5705b1b |
EnvironmentFile=/etc/sysconfig/quagga
|
|
|
5705b1b |
ExecStartPre=-/bin/chmod -f 640 /etc/quagga/bgpd.conf
|
|
|
5705b1b |
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/bgpd.conf
|
|
|
5705b1b |
+ExecStartPre=-/bin/chown -f ${QUAGGA_USER}:${QUAGGA_GROUP} /etc/quagga/bgpd.conf
|
|
|
5705b1b |
ExecStart=/usr/sbin/bgpd -d $BGPD_OPTS -f /etc/quagga/bgpd.conf
|
|
|
5705b1b |
Restart=on-abort
|
|
|
5705b1b |
|
|
|
5705b1b |
diff --git a/redhat/isisd.service b/redhat/isisd.service
|
|
|
5705b1b |
index 93663aa..db33281 100644
|
|
|
5705b1b |
--- a/redhat/isisd.service
|
|
|
5705b1b |
+++ b/redhat/isisd.service
|
|
|
5705b1b |
@@ -11,7 +11,7 @@ Documentation=man:isisd
|
|
|
5705b1b |
Type=forking
|
|
|
5705b1b |
EnvironmentFile=/etc/sysconfig/quagga
|
|
|
5705b1b |
ExecStartPre=-/bin/chmod -f 640 /etc/quagga/isisd.conf
|
|
|
5705b1b |
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/isisd.conf
|
|
|
5705b1b |
+ExecStartPre=-/bin/chown -f ${QUAGGA_USER}:${QUAGGA_GROUP} /etc/quagga/isisd.conf
|
|
|
5705b1b |
ExecStart=/usr/sbin/isisd -d $ISISD_OPTS -f /etc/quagga/isisd.conf
|
|
|
5705b1b |
Restart=on-abort
|
|
|
5705b1b |
|
|
|
5705b1b |
diff --git a/redhat/nhrpd.service b/redhat/nhrpd.service
|
|
|
5705b1b |
index 5b4120d..043c220 100644
|
|
|
5705b1b |
--- a/redhat/nhrpd.service
|
|
|
5705b1b |
+++ b/redhat/nhrpd.service
|
|
|
5705b1b |
@@ -11,7 +11,7 @@ Documentation=man:nhrpd
|
|
|
5705b1b |
Type=forking
|
|
|
5705b1b |
EnvironmentFile=/etc/sysconfig/quagga
|
|
|
5705b1b |
ExecStartPre=-/bin/chmod -f 640 /etc/quagga/nhrpd.conf
|
|
|
5705b1b |
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/nhrpd.conf
|
|
|
5705b1b |
+ExecStartPre=-/bin/chown -f ${QUAGGA_USER}:${QUAGGA_GROUP} /etc/quagga/nhrpd.conf
|
|
|
5705b1b |
ExecStart=/usr/sbin/nhrpd -d $NHRPD_OPTS -f /etc/quagga/nhrpdd.conf
|
|
|
5705b1b |
Restart=on-abort
|
|
|
5705b1b |
|
|
|
5705b1b |
diff --git a/redhat/ospf6d.service b/redhat/ospf6d.service
|
|
|
5705b1b |
index 3c1c978..a0d6223 100644
|
|
|
5705b1b |
--- a/redhat/ospf6d.service
|
|
|
5705b1b |
+++ b/redhat/ospf6d.service
|
|
|
5705b1b |
@@ -11,7 +11,7 @@ Documentation=man:ospf6d
|
|
|
5705b1b |
Type=forking
|
|
|
5705b1b |
EnvironmentFile=/etc/sysconfig/quagga
|
|
|
5705b1b |
ExecStartPre=-/bin/chmod -f 640 /etc/quagga/ospf6d.conf
|
|
|
5705b1b |
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/ospf6d.conf
|
|
|
5705b1b |
+ExecStartPre=-/bin/chown -f ${QUAGGA_USER}:${QUAGGA_GROUP} /etc/quagga/ospf6d.conf
|
|
|
5705b1b |
ExecStart=/usr/sbin/ospf6d -d $OSPF6D_OPTS -f /etc/quagga/ospf6d.conf
|
|
|
5705b1b |
Restart=on-abort
|
|
|
5705b1b |
|
|
|
5705b1b |
diff --git a/redhat/ospfd.service b/redhat/ospfd.service
|
|
|
5705b1b |
index 0084b6c..ffc048a 100644
|
|
|
5705b1b |
--- a/redhat/ospfd.service
|
|
|
5705b1b |
+++ b/redhat/ospfd.service
|
|
|
5705b1b |
@@ -11,7 +11,7 @@ Documentation=man:ospfd
|
|
|
5705b1b |
Type=forking
|
|
|
5705b1b |
EnvironmentFile=/etc/sysconfig/quagga
|
|
|
5705b1b |
ExecStartPre=-/bin/chmod -f 640 /etc/quagga/ospfd.conf
|
|
|
5705b1b |
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/ospfd.conf
|
|
|
5705b1b |
+ExecStartPre=-/bin/chown -f ${QUAGGA_USER}:${QUAGGA_GROUP} /etc/quagga/ospfd.conf
|
|
|
5705b1b |
ExecStart=/usr/sbin/ospfd -d $OSPFD_OPTS -f /etc/quagga/ospfd.conf
|
|
|
5705b1b |
Restart=on-abort
|
|
|
5705b1b |
|
|
|
5705b1b |
diff --git a/redhat/pimd.service b/redhat/pimd.service
|
|
|
5705b1b |
index 1916846..ae30f16 100644
|
|
|
5705b1b |
--- a/redhat/pimd.service
|
|
|
5705b1b |
+++ b/redhat/pimd.service
|
|
|
5705b1b |
@@ -9,7 +9,7 @@ Documentation=man:pimd
|
|
|
5705b1b |
Type=forking
|
|
|
5705b1b |
EnvironmentFile=/etc/sysconfig/quagga
|
|
|
5705b1b |
ExecStartPre=-/bin/chmod -f 640 /etc/quagga/pimd.conf
|
|
|
5705b1b |
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/pimd.conf
|
|
|
5705b1b |
+ExecStartPre=-/bin/chown -f ${QUAGGA_USER}:${QUAGGA_GROUP} /etc/quagga/pimd.conf
|
|
|
5705b1b |
ExecStart=/usr/sbin/pimd -d $PIMD_OPTS -f /etc/quagga/pimd.conf
|
|
|
5705b1b |
Restart=on-abort
|
|
|
5705b1b |
|
|
|
5705b1b |
diff --git a/redhat/ripd.service b/redhat/ripd.service
|
|
|
5705b1b |
index 103b5a9..56e885a 100644
|
|
|
5705b1b |
--- a/redhat/ripd.service
|
|
|
5705b1b |
+++ b/redhat/ripd.service
|
|
|
5705b1b |
@@ -11,7 +11,7 @@ Documentation=man:ripd
|
|
|
5705b1b |
Type=forking
|
|
|
5705b1b |
EnvironmentFile=/etc/sysconfig/quagga
|
|
|
5705b1b |
ExecStartPre=-/bin/chmod -f 640 /etc/quagga/ripd.conf
|
|
|
5705b1b |
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/ripd.conf
|
|
|
5705b1b |
+ExecStartPre=-/bin/chown -f ${QUAGGA_USER}:${QUAGGA_GROUP} /etc/quagga/ripd.conf
|
|
|
5705b1b |
ExecStart=/usr/sbin/ripd -d $RIPD_OPTS -f /etc/quagga/ripd.conf
|
|
|
5705b1b |
Restart=on-abort
|
|
|
5705b1b |
|
|
|
5705b1b |
diff --git a/redhat/ripngd.service b/redhat/ripngd.service
|
|
|
5705b1b |
index 6fe6ba8..c0defa0 100644
|
|
|
5705b1b |
--- a/redhat/ripngd.service
|
|
|
5705b1b |
+++ b/redhat/ripngd.service
|
|
|
5705b1b |
@@ -11,7 +11,7 @@ Documentation=man:ripngd
|
|
|
5705b1b |
Type=forking
|
|
|
5705b1b |
EnvironmentFile=/etc/sysconfig/quagga
|
|
|
5705b1b |
ExecStartPre=-/bin/chmod -f 640 /etc/quagga/ripngd.conf
|
|
|
5705b1b |
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/ripngd.conf
|
|
|
5705b1b |
+ExecStartPre=-/bin/chown -f ${QUAGGA_USER}:${QUAGGA_GROUP} /etc/quagga/ripngd.conf
|
|
|
5705b1b |
ExecStart=/usr/sbin/ripngd -d $RIPNGD_OPTS -f /etc/quagga/ripngd.conf
|
|
|
5705b1b |
Restart=on-abort
|
|
|
5705b1b |
|
|
|
5705b1b |
diff --git a/redhat/zebra.service b/redhat/zebra.service
|
|
|
5705b1b |
index fa5a004..d4ba5ea 100644
|
|
|
5705b1b |
--- a/redhat/zebra.service
|
|
|
5705b1b |
+++ b/redhat/zebra.service
|
|
|
5705b1b |
@@ -11,8 +11,8 @@ Type=forking
|
|
|
5705b1b |
EnvironmentFile=-/etc/sysconfig/quagga
|
|
|
5705b1b |
ExecStartPre=/sbin/ip route flush proto zebra
|
|
|
5705b1b |
ExecStartPre=-/bin/chmod -f 640 /etc/quagga/vtysh.conf /etc/quagga/zebra.conf
|
|
|
5705b1b |
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /run/quagga /etc/quagga/zebra.conf
|
|
|
5705b1b |
-ExecStartPre=-/bin/chown -f ${QUAGGA_USER}${VTY_GROUP:+":$VTY_GROUP"} quaggavty /etc/quagga/vtysh.conf
|
|
|
5705b1b |
+ExecStartPre=-/bin/chown -f ${QUAGGA_USER}:${QUAGGA_GROUP} /run/quagga /etc/quagga/zebra.conf
|
|
|
5705b1b |
+ExecStartPre=-/bin/sh -c '/bin/chown -f ${QUAGGA_USER}${VTY_GROUP:+":$VTY_GROUP"} /etc/quagga/vtysh.conf'
|
|
|
5705b1b |
ExecStart=/usr/sbin/zebra -d $ZEBRA_OPTS -f /etc/quagga/zebra.conf
|
|
|
5705b1b |
Restart=on-abort
|
|
|
5705b1b |
|