]> code.ossystems Code Review - openembedded-core.git/commitdiff
update-rc.d: add -f into postinst OPT
authorChangqing Li <changqing.li@windriver.com>
Mon, 15 Oct 2018 07:24:11 +0000 (15:24 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 16 Oct 2018 19:25:37 +0000 (20:25 +0100)
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@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/update-rc.d.bbclass

index 06e3b213965bdda980aa621b5382b4b23d1af740..265c4be9d1ef4f7ff5a2cfbb824873108bc3a92c 100644 (file)
@@ -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