diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2018-06-13 15:58:23 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-18 11:07:57 +0100 |
commit | d200e3196d6646a43be1aa5ec80d299b6524bac0 (patch) | |
tree | a7ce98b756967fe0ee45161793cc87dfb49f39e3 /meta/recipes-extended/watchdog/watchdog_5.15.bb | |
parent | 8aee3cce93666c758c9f01ffbcbdb8da915cb2dc (diff) | |
download | poky-d200e3196d6646a43be1aa5ec80d299b6524bac0.tar.gz |
watchdog: fix init script for sysvinit
The current init script is installed from source with redhat style.
It does not get configuration from /etc/default/watchdog. We should use
debian style init script.
Write our own script just like what wd_keepalive does.
Also, in the init script, we check the existence of /dev/watchdog to
determine whether to start the daemon or not.
(From OE-Core rev: a31f8dd34e8ea34dfb087ed464575aa390ece09b)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/watchdog/watchdog_5.15.bb')
-rw-r--r-- | meta/recipes-extended/watchdog/watchdog_5.15.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-extended/watchdog/watchdog_5.15.bb b/meta/recipes-extended/watchdog/watchdog_5.15.bb index 8353ec0d20..1acab2e9e7 100644 --- a/meta/recipes-extended/watchdog/watchdog_5.15.bb +++ b/meta/recipes-extended/watchdog/watchdog_5.15.bb | |||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ecc0551bf54ad97f6b541720f84d6569" | |||
11 | SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \ | 11 | SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \ |
12 | file://0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch \ | 12 | file://0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch \ |
13 | file://0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch \ | 13 | file://0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch \ |
14 | file://watchdog-init.patch \ | 14 | file://watchdog.init \ |
15 | file://wd_keepalive.init \ | 15 | file://wd_keepalive.init \ |
16 | " | 16 | " |
17 | 17 | ||
@@ -31,7 +31,7 @@ EXTRA_OECONF += " --disable-nfs " | |||
31 | 31 | ||
32 | INITSCRIPT_PACKAGES = "${PN} ${PN}-keepalive" | 32 | INITSCRIPT_PACKAGES = "${PN} ${PN}-keepalive" |
33 | 33 | ||
34 | INITSCRIPT_NAME_${PN} = "watchdog.sh" | 34 | INITSCRIPT_NAME_${PN} = "watchdog" |
35 | INITSCRIPT_PARAMS_${PN} = "start 25 1 2 3 4 5 . stop 85 0 6 ." | 35 | INITSCRIPT_PARAMS_${PN} = "start 25 1 2 3 4 5 . stop 85 0 6 ." |
36 | 36 | ||
37 | INITSCRIPT_NAME_${PN}-keepalive = "wd_keepalive" | 37 | INITSCRIPT_NAME_${PN}-keepalive = "wd_keepalive" |
@@ -49,7 +49,7 @@ do_install_append() { | |||
49 | install -m 0644 ${S}/debian/watchdog.service ${D}${systemd_system_unitdir} | 49 | install -m 0644 ${S}/debian/watchdog.service ${D}${systemd_system_unitdir} |
50 | install -m 0644 ${S}/debian/wd_keepalive.service ${D}${systemd_system_unitdir} | 50 | install -m 0644 ${S}/debian/wd_keepalive.service ${D}${systemd_system_unitdir} |
51 | 51 | ||
52 | install -D ${S}/redhat/watchdog.init ${D}/${sysconfdir}/init.d/watchdog.sh | 52 | install -Dm 0755 ${WORKDIR}/watchdog.init ${D}/${sysconfdir}/init.d/watchdog |
53 | install -Dm 0755 ${WORKDIR}/wd_keepalive.init ${D}${sysconfdir}/init.d/wd_keepalive | 53 | install -Dm 0755 ${WORKDIR}/wd_keepalive.init ${D}${sysconfdir}/init.d/wd_keepalive |
54 | 54 | ||
55 | # watchdog.conf is provided by the watchdog-config recipe | 55 | # watchdog.conf is provided by the watchdog-config recipe |