diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2018-10-18 15:20:20 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-10-18 06:32:00 -0700 |
commit | a5591f7aee24a4ad792d7dd0dea0f7252a68c7a8 (patch) | |
tree | 0d218ec91fac36a1fb4103891b45803cec2402bb /meta-networking/recipes-daemons/radvd | |
parent | 60a8dedf9a291fecb260a48a14b9c268bc0eb5b4 (diff) | |
download | meta-openembedded-a5591f7aee24a4ad792d7dd0dea0f7252a68c7a8.tar.gz |
radvd: remove update-rc.d settings
We don't offer /etc/radvd.conf but only radvd.conf.example which would
cause a startup error:
Starting radvd:
* /etc/radvd.conf does not exist or is empty.
Remove update-rc.d settings to make it doesn't start by default.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-daemons/radvd')
-rw-r--r-- | meta-networking/recipes-daemons/radvd/radvd.inc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/meta-networking/recipes-daemons/radvd/radvd.inc b/meta-networking/recipes-daemons/radvd/radvd.inc index 06d16a4ce..59a07d78d 100644 --- a/meta-networking/recipes-daemons/radvd/radvd.inc +++ b/meta-networking/recipes-daemons/radvd/radvd.inc | |||
@@ -20,7 +20,7 @@ SRC_URI = "http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz \ | |||
20 | file://volatiles.03_radvd \ | 20 | file://volatiles.03_radvd \ |
21 | file://radvd.default" | 21 | file://radvd.default" |
22 | 22 | ||
23 | inherit autotools update-rc.d useradd pkgconfig systemd | 23 | inherit autotools useradd pkgconfig systemd |
24 | 24 | ||
25 | SYSTEMD_SERVICE_${PN} = "radvd.service" | 25 | SYSTEMD_SERVICE_${PN} = "radvd.service" |
26 | SYSTEMD_AUTO_ENABLE = "disable" | 26 | SYSTEMD_AUTO_ENABLE = "disable" |
@@ -36,7 +36,7 @@ do_install_append () { | |||
36 | sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/radvd | 36 | sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/radvd |
37 | sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/radvd | 37 | sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/radvd |
38 | 38 | ||
39 | install -m 0644 ${WORKDIR}/volatiles.03_radvd ${D}${sysconfdir}/default/volatiles/volatiles.03_radvd | 39 | install -m 0644 ${WORKDIR}/volatiles.03_radvd ${D}${sysconfdir}/default/volatiles/03_radvd |
40 | 40 | ||
41 | # Install systemd service files | 41 | # Install systemd service files |
42 | install -d ${D}${systemd_unitdir}/system | 42 | install -d ${D}${systemd_unitdir}/system |
@@ -54,9 +54,6 @@ do_install_append () { | |||
54 | done | 54 | done |
55 | } | 55 | } |
56 | 56 | ||
57 | INITSCRIPT_NAME = "radvd" | ||
58 | INITSCRIPT_PARAMS = "defaults 20 80" | ||
59 | |||
60 | USERADD_PACKAGES = "${PN}" | 57 | USERADD_PACKAGES = "${PN}" |
61 | USERADD_PARAM_${PN} = "--system --home ${localstatedir}/run/radvd/ -M -g nogroup radvd" | 58 | USERADD_PARAM_${PN} = "--system --home ${localstatedir}/run/radvd/ -M -g nogroup radvd" |
62 | 59 | ||