X-Git-Url: https://git.sommitrealweird.co.uk/quagga-debian.git/blobdiff_plain/6d99eb2938e976229cb50d848a1bc491532b54f9..191fe7a34582876de01d3e62c2a6587baf59a283:/debian/patches/0006-Patch-.service-files-for-Debian.patch diff --git a/debian/patches/0006-Patch-.service-files-for-Debian.patch b/debian/patches/0006-Patch-.service-files-for-Debian.patch new file mode 100644 index 0000000..6bbdde3 --- /dev/null +++ b/debian/patches/0006-Patch-.service-files-for-Debian.patch @@ -0,0 +1,210 @@ +From: Scott Leggett +Date: Sun, 5 Nov 2017 15:11:51 +1100 +Subject: Patch .service files for Debian. + +--- + redhat/bgpd.service | 6 ++++-- + redhat/isisd.service | 6 ++++-- + redhat/nhrpd.service | 6 ++++-- + redhat/ospf6d.service | 6 ++++-- + redhat/ospfd.service | 6 ++++-- + redhat/pimd.service | 14 +++++++++----- + redhat/ripd.service | 6 ++++-- + redhat/ripngd.service | 6 ++++-- + redhat/zebra.service | 10 ++++++++-- + 9 files changed, 45 insertions(+), 21 deletions(-) + +diff --git a/redhat/bgpd.service b/redhat/bgpd.service +index ef24841..f1ddfd9 100644 +--- a/redhat/bgpd.service ++++ b/redhat/bgpd.service +@@ -5,11 +5,13 @@ Wants=network.target + After=zebra.service network-pre.target + Before=network.target + ConditionPathExists=/etc/quagga/bgpd.conf ++Documentation=man:bgpd + + [Service] + Type=forking +-EnvironmentFile=/etc/sysconfig/quagga +-ExecStart=/usr/sbin/bgpd -d $BGPD_OPTS -f /etc/quagga/bgpd.conf ++ExecStartPre=-/bin/chmod -f 640 /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 edb6eea..a16b2f8 100644 +--- a/redhat/isisd.service ++++ b/redhat/isisd.service +@@ -5,11 +5,13 @@ Wants=network.target + After=zebra.service network-pre.target + Before=network.target + ConditionPathExists=/etc/quagga/isisd.conf ++Documentation=man:isisd + + [Service] + Type=forking +-EnvironmentFile=/etc/sysconfig/quagga +-ExecStart=/usr/sbin/isisd -d $ISISD_OPTS -f /etc/quagga/isisd.conf ++ExecStartPre=-/bin/chmod -f 640 /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 63f138c..15680e8 100644 +--- a/redhat/nhrpd.service ++++ b/redhat/nhrpd.service +@@ -5,11 +5,13 @@ Wants=network.target + After=zebra.service network-pre.target + Before=network.target + ConditionPathExists=/etc/quagga/nhrpd.conf ++Documentation=man:nhrpd + + [Service] + Type=forking +-EnvironmentFile=/etc/sysconfig/quagga +-ExecStart=/usr/sbin/nhrpd -d $NHRPD_OPTS -f /etc/quagga/nhrpdd.conf ++ExecStartPre=-/bin/chmod -f 640 /etc/quagga/nhrpd.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 b53b970..c883e5c 100644 +--- a/redhat/ospf6d.service ++++ b/redhat/ospf6d.service +@@ -5,11 +5,13 @@ Wants=network.target + After=zebra.service network-pre.target + Before=network.target + ConditionPathExists=/etc/quagga/ospf6d.conf ++Documentation=man:ospf6d + + [Service] + Type=forking +-EnvironmentFile=/etc/sysconfig/quagga +-ExecStart=/usr/sbin/ospf6d -d $OSPF6D_OPTS -f /etc/quagga/ospf6d.conf ++ExecStartPre=-/bin/chmod -f 640 /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 5d6c5bb..57b3bee 100644 +--- a/redhat/ospfd.service ++++ b/redhat/ospfd.service +@@ -5,11 +5,13 @@ Wants=network.target + After=zebra.service network-pre.target + Before=network.target + ConditionPathExists=/etc/quagga/ospfd.conf ++Documentation=man:ospfd + + [Service] + Type=forking +-EnvironmentFile=/etc/sysconfig/quagga +-ExecStart=/usr/sbin/ospfd -d $OSPFD_OPTS -f /etc/quagga/ospfd.conf ++ExecStartPre=-/bin/chmod -f 640 /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 d62fe64..b2d33f3 100644 +--- a/redhat/pimd.service ++++ b/redhat/pimd.service +@@ -1,14 +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 +-ExecStart=/usr/sbin/pimd -d $PIMD_OPTS -f /etc/quagga/pimd.conf ++ExecStartPre=-/bin/chmod -f 640 /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 ed7f922..d6290e0 100644 +--- a/redhat/ripd.service ++++ b/redhat/ripd.service +@@ -5,11 +5,13 @@ Wants=network.target + After=zebra.service network-pre.target + Before=network.target + ConditionPathExists=/etc/quagga/ripd.conf ++Documentation=man:ripd + + [Service] + Type=forking +-EnvironmentFile=/etc/sysconfig/quagga +-ExecStart=/usr/sbin/ripd -d $RIPD_OPTS -f /etc/quagga/ripd.conf ++ExecStartPre=-/bin/chmod -f 640 /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 2519b31..2e4ccb8 100644 +--- a/redhat/ripngd.service ++++ b/redhat/ripngd.service +@@ -5,11 +5,13 @@ Wants=network.target + After=zebra.service network-pre.target + Before=network.target + ConditionPathExists=/etc/quagga/ripngd.conf ++Documentation=man:ripngd + + [Service] + Type=forking +-EnvironmentFile=/etc/sysconfig/quagga +-ExecStart=/usr/sbin/ripngd -d $RIPNGD_OPTS -f /etc/quagga/ripngd.conf ++ExecStartPre=-/bin/chmod -f 640 /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 f9107f1..39080a0 100644 +--- a/redhat/zebra.service ++++ b/redhat/zebra.service +@@ -4,13 +4,19 @@ Wants=network.target + Before=network.target + After=network-pre.target + ConditionPathExists=/etc/quagga/zebra.conf ++Documentation=man:zebra + + [Service] + Type=forking +-EnvironmentFile=-/etc/sysconfig/quagga + ExecStartPre=/sbin/ip route flush proto zebra +-ExecStart=/usr/sbin/zebra -d $ZEBRA_OPTS -f /etc/quagga/zebra.conf ++ExecStartPre=-/bin/chmod -f 640 /etc/quagga/vtysh.conf /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