From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 7 Aug 2011 09:21:18 +0000 (+0200)
Subject: radvd: Use network scripts to generate configuration file.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7070545f8331fd3789bc3969ceb640e5c2030bed;p=ipfire-3.x.git

radvd: Use network scripts to generate configuration file.
---

diff --git a/pkgs/radvd/radvd.nm b/pkgs/radvd/radvd.nm
index d82c7e98c..bb9dfa1e2 100644
--- a/pkgs/radvd/radvd.nm
+++ b/pkgs/radvd/radvd.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = radvd
 PKG_VER        = 1.8
-PKG_REL        = 3
+PKG_REL        = 4
 
 PKG_MAINTAINER =
 PKG_GROUPS     = System/Daemons
@@ -35,6 +35,7 @@ PKG_LICENSE    = BSD with advertising
 PKG_SUMMARY    = A Router Advertisement daemon.
 
 PKG_BUILD_DEPS+= flex flex-devel bison
+PKG_DEPS      += /lib/network/network-radvd-config
 
 define PKG_DESCRIPTION
 	radvd is the router advertisement daemon for IPv6. It listens to \
diff --git a/pkgs/radvd/systemd/radvd.service b/pkgs/radvd/systemd/radvd.service
index 08cbc1eef..25cff9994 100644
--- a/pkgs/radvd/systemd/radvd.service
+++ b/pkgs/radvd/systemd/radvd.service
@@ -4,7 +4,9 @@ Requires=network.target
 After=network.target
 
 [Service]
+ExecStartPre=/lib/network/network-radvd-config start
 ExecStart=/usr/sbin/radvd -C /etc/radvd.conf -u radvd
+ExecStopPre=/lib/network/network-radvd-config stop
 ExecReload=/bin/kill -HUP $MAINPID
 Type=forking
 PIDFile=/run/radvd/radvd.pid