summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2017-01-11 15:07:24 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2017-04-11 11:21:55 +0200
commit54a5789a795b7aa907dd30d91b40ac18c25548b7 (patch)
treeba75ba90aa19b2afa88745bcc49b5570dcd2cc14
parent73ccb178820e7d74632cfcc511256c7032ae230e (diff)
downloadptxdist-54a5789a795b7aa907dd30d91b40ac18c25548b7.tar.gz
ptxdist-54a5789a795b7aa907dd30d91b40ac18c25548b7.tar.xz
radvd: /usr merge
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--projectroot/usr/lib/systemd/system/radvd.service (renamed from projectroot/lib/systemd/system/radvd.service)0
-rw-r--r--rules/radvd.make4
2 files changed, 2 insertions, 2 deletions
diff --git a/projectroot/lib/systemd/system/radvd.service b/projectroot/usr/lib/systemd/system/radvd.service
index d3c7d98aa..d3c7d98aa 100644
--- a/projectroot/lib/systemd/system/radvd.service
+++ b/projectroot/usr/lib/systemd/system/radvd.service
diff --git a/rules/radvd.make b/rules/radvd.make
index 4393835a7..81d5bda7f 100644
--- a/rules/radvd.make
+++ b/rules/radvd.make
@@ -55,8 +55,8 @@ $(STATEDIR)/radvd.targetinstall:
@$(call install_alternative, radvd, 0, 0, 0644, /etc/radvd.conf)
ifdef PTXCONF_RADVD_SYSTEMD_SERVICE
- @$(call install_alternative, radvd, 0, 0, 0644, /lib/systemd/system/radvd.service)
- @$(call install_link, radvd, ../radvd.service, /lib/systemd/system/network.target.wants/radvd.service)
+ @$(call install_alternative, radvd, 0, 0, 0644, /usr/lib/systemd/system/radvd.service)
+ @$(call install_link, radvd, ../radvd.service, /usr/lib/systemd/system/network.target.wants/radvd.service)
endif
@$(call install_finish, radvd)