diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2013-01-17 20:56:38 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-18 13:28:08 +0000 |
| commit | ee5333b0bdb1c1dfe678b319ac6f7ebd97a6ff57 (patch) | |
| tree | e587aa4f8afde263aa9a2a36f2e87cd5b922686f | |
| parent | fbfaefb7e927e16a607f602db6e17a85dfba5433 (diff) | |
| download | poky-ee5333b0bdb1c1dfe678b319ac6f7ebd97a6ff57.tar.gz | |
update-rc.d:fix support postrm at image creation time
updatercd_postrm failed at image creation time because "-f -r ${D}" is not
used as update-rc.d's option.
[YOCTO #3633]
(From OE-Core rev: deb8ac868a989f41c0664312a5fb855358be2296)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/update-rc.d.bbclass | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index 3364269167..83816d6ad6 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass | |||
| @@ -28,7 +28,11 @@ fi | |||
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | updatercd_postrm() { | 30 | updatercd_postrm() { |
| 31 | update-rc.d $D ${INITSCRIPT_NAME} remove | 31 | if [ "$D" != "" ]; then |
| 32 | update-rc.d -f -r $D ${INITSCRIPT_NAME} remove | ||
| 33 | else | ||
| 34 | update-rc.d ${INITSCRIPT_NAME} remove | ||
| 35 | fi | ||
| 32 | } | 36 | } |
| 33 | 37 | ||
| 34 | 38 | ||
