[oe-commits] Chen Qi : update-rc.d: use '-f' option in updatercd_postrm

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: ebb2d557bbf410d98040cdaabbddd7e3ee0a9709
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ebb2d557bbf410d98040cdaabbddd7e3ee0a9709

Author: Chen Qi <Qi.Chen at windriver.com>
Date:   Tue Feb 17 10:08:14 2015 +0800

update-rc.d: use '-f' option in updatercd_postrm

Use '-f' ('--force') option so that while removing packages using deb,
we don't fail because of the following error:

   update-rc.d: $initd/$bn exists during rc.d purge (use -f to force)

Using '-f' option would make this a warning but continue to execute.

   update-rc.d: $initd/$bn exists during rc.d purge (continuing)

We need this option because dpkg package backend have special handling for
configuration files. And if files under /etc/init.d are treated as configuration
files, we will have errors.

Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/update-rc.d.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index bc1aa7d..a9c0323 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -48,9 +48,9 @@ fi
 updatercd_postrm() {
 if type update-rc.d >/dev/null 2>/dev/null; then
 	if [ -n "$D" ]; then
-		OPT="-r $D"
+		OPT="-f -r $D"
 	else
-		OPT=""
+		OPT="-f"
 	fi
 	update-rc.d $OPT ${INITSCRIPT_NAME} remove
 fi