[oe-commits] [openembedded-core] 01/03: update-rc.d: add -f into postinst OPT

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 0a769ed2d777811c96aa72ca58fd0fbdaa823765
Author: Changqing Li <changqing.li at windriver.com>
AuthorDate: Mon Oct 15 15:24:11 2018 +0800

    update-rc.d: add -f into postinst OPT
    
    add -f into postinst OPT to fix run postinst scriptlet fail
    problem during do rootfs, while INITSCRIPT_PARAMS set to remove.
    
    + type update-rc.d
    + '[' -n qemux86_64-poky-linux/core-image-sato/1.0-r0/rootfs ']'
    + OPT='-r qemux86_64-poky-linux/core-image-sato/1.0-r0/rootfs'
    + update-rc.d -r work/qemux86_64-poky-linux/core-image-sato/1.0-r0/rootfs keepalived remove
    update-rc.d: work/qemux86_64-poky-linux/core-image-sato/1.0-r0/rootfs/etc/init.d/keepalived exists during rc.d purge (use -f to force)
    D: %post(keepalived-1.4.2-r0.core2_64): waitpid(305974) rc 305974 status 100
    
    Signed-off-by: Changqing Li <changqing.li at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.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 06e3b21..265c4be 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -39,9 +39,9 @@ PACKAGE_WRITE_DEPS += "update-rc.d-native"
 updatercd_postinst() {
 if ${@use_updatercd(d)} && type update-rc.d >/dev/null 2>/dev/null; then
 	if [ -n "$D" ]; then
-		OPT="-r $D"
+		OPT="-f -r $D"
 	else
-		OPT="-s"
+		OPT="-f -s"
 	fi
 	update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
 fi

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.