diff options
| author |   Chen Qi <Qi.Chen@windriver.com> | 2014-10-17 15:05:55 +0800 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2014-10-21 15:07:12 -0400 |
| commit | 350139ba63fc1cf84d04c482a5407dfa8b724f63 (patch) | |
| tree | 812bf877d59c41106cfaeb0585987c51b51dc5cc /meta-networking | |
| parent | d63401ea24931f3fff02246ca557e95dff9e56f0 (diff) | |
| download | meta-openembedded-contrib-350139ba63fc1cf84d04c482a5407dfa8b724f63.tar.gz | |
radvd: fix daemon start-up
1. Fix radvd.service to start daemon correctly.
2. Make the daemon run under 'radvd' user by default.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-daemons/radvd/files/radvd.default | 1 | ||||
| -rw-r--r-- | meta-networking/recipes-daemons/radvd/files/radvd.service | 5 | ||||
| -rw-r--r-- | meta-networking/recipes-daemons/radvd/radvd.inc | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/meta-networking/recipes-daemons/radvd/files/radvd.default b/meta-networking/recipes-daemons/radvd/files/radvd.default new file mode 100644 index 0000000000..7cb73c7716 --- /dev/null +++ b/meta-networking/recipes-daemons/radvd/files/radvd.default @@ -0,0 +1 @@ +OPTIONS="-u radvd" diff --git a/meta-networking/recipes-daemons/radvd/files/radvd.service b/meta-networking/recipes-daemons/radvd/files/radvd.service index 3aac7b27db..e60798a6b3 100644 --- a/meta-networking/recipes-daemons/radvd/files/radvd.service +++ b/meta-networking/recipes-daemons/radvd/files/radvd.service @@ -4,11 +4,8 @@ After=network.target ConditionPathExists=@SYSCONFDIR@/radvd.conf [Service] -Type=forking -PIDFile=/var/run/radvd/radvd.pid EnvironmentFile=-@SYSCONFDIR@/default/radvd -ExecStartPre=@BASE_BINDIR@/mkdir -p /var/run/radvd -ExecStart=@SBINDIR@/radvd $OPTIONS +ExecStart=@SBINDIR@/radvd -n $OPTIONS [Install] WantedBy=multi-user.target diff --git a/meta-networking/recipes-daemons/radvd/radvd.inc b/meta-networking/recipes-daemons/radvd/radvd.inc index 85d1a85b13..6b595b07f3 100644 --- a/meta-networking/recipes-daemons/radvd/radvd.inc +++ b/meta-networking/recipes-daemons/radvd/radvd.inc @@ -17,7 +17,8 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=73ebbf7182ae996e65e8fadc9a8c45db" SRC_URI = "http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz \ file://radvd.init \ file://radvd.service \ - file://volatiles.03_radvd" + file://volatiles.03_radvd \ + file://radvd.default" inherit autotools update-rc.d useradd pkgconfig systemd @@ -44,6 +45,9 @@ do_install_append () { -e 's#@SBINDIR@#${sbindir}#g' \ -e 's#@BASE_BINDIR@#${base_bindir}#g' ${D}${systemd_unitdir}/system/radvd.service + # Install default environment file + install -m 0644 ${WORKDIR}/radvd.default ${D}${sysconfdir}/default/radvd + # Documentation for i in radvd.conf.example README; do \ install -m 0644 ${S}/$i ${D}${docdir}/radvd; \ |