diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/frr.lintian-overrides | 4 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/systemd-deps.patch | 29 |
4 files changed, 32 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 1188575d70..3c024ecec7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ frr (6.0.2-2) UNRELEASED; urgency=medium - * remove bogus libjson0 build-dep + * remove bogus libjson0 build-dep (closes: #921349) + * fix broken systemd dependency spec -- David Lamparter <equinox-debian@diac24.net> Mon, 04 Feb 2019 04:51:00 +0100 diff --git a/debian/frr.lintian-overrides b/debian/frr.lintian-overrides index 4df816fa05..a3e6fcdc25 100644 --- a/debian/frr.lintian-overrides +++ b/debian/frr.lintian-overrides @@ -1,7 +1,3 @@ -# we're a bit special since we provide network connectivity by starting up -# routing protocols. -frr binary: systemd-service-file-refers-to-unusual-wantedby-target lib/systemd/system/frr.service network-online.target - # function names & co. frr binary: spelling-error-in-binary usr/lib/*/frr/libfrr.so.0.0.0 writen written frr binary: spelling-error-in-binary usr/lib/*/frr/libfrrospfapiclient.so.0.0.0 writen written diff --git a/debian/patches/series b/debian/patches/series index 3a90c917bd..b25c135492 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0001-vtysh-fix-pager-compatibility-handling.patch 0002-watchfrr-build-in-defaults-for-r-s-k.patch +systemd-deps.patch diff --git a/debian/patches/systemd-deps.patch b/debian/patches/systemd-deps.patch new file mode 100644 index 0000000000..8543fa21a2 --- /dev/null +++ b/debian/patches/systemd-deps.patch @@ -0,0 +1,29 @@ +Author: David Lamparter <equinox@diac24.net> +Subject: fix systemd install & dependencies +Last-Update: 2019-02-04 + +cf. https://github.com/FRRouting/frr/pull/3715 +(This does _not_ match the change currently proposed there, instead imitating +what NetworkManager has in its service file.) + +diff --git a/tools/frr.service b/tools/frr.service +index c7568593b36d..aa45f420fea3 100644 +--- a/tools/frr.service ++++ b/tools/frr.service +@@ -1,7 +1,9 @@ + [Unit] + Description=FRRouting + Documentation=https://frrouting.readthedocs.io/en/latest/setup.html +-After=networking.service ++Wants=network.target ++After=network-pre.target systemd-sysctl.service ++Before=network.target + OnFailure=heartbeat-failed@%n.service + + [Service] +@@ -20,4 +22,4 @@ ExecStop=/usr/lib/frr/frrinit.sh stop + ExecReload=/usr/lib/frr/frrinit.sh reload + + [Install] +-WantedBy=network-online.target ++WantedBy=multi-user.target |