diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-09-05 08:33:21 -0400 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-09-05 13:59:16 -0700 |
commit | 98e284846c9929dbaeddeb77ad2271f18fd85bdc (patch) | |
tree | 99d63d113282bb70b3cb40c316ce75ffca266460 | |
parent | c6a235aab14a7e83d6d8e32584bf8973b46a7acb (diff) | |
download | meta-openembedded-98e284846c9929dbaeddeb77ad2271f18fd85bdc.tar.gz |
sblim-sfcb: do not use 'exit 1' to postpone to first boot
Since `939f7f1 meta/lib/oe/rootfs.py: do not execute
defer_to_first_boot when processing postinst_intercept hooks' applied
in oe-core, use defer_to_first_boot rather than `exit 1' to postpone
to first boot
Remove duplicated `systemctl enable', it is done in systemd.bbclass
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb index ffbe7ea1b4..91c50027d8 100644 --- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb +++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb | |||
@@ -68,14 +68,8 @@ do_install() { | |||
68 | } | 68 | } |
69 | 69 | ||
70 | pkg_postinst_${PN} () { | 70 | pkg_postinst_${PN} () { |
71 | OPTS="" | ||
72 | |||
73 | if [ x"$D" != "x" ]; then | 71 | if [ x"$D" != "x" ]; then |
74 | OPTS="--root=$D" | 72 | $INTERCEPT_DIR/postinst_intercept delay_to_first_boot ${PKG} mlprefix=${MLPREFIX} |
75 | if type systemctl >/dev/null 2>/dev/null; then | ||
76 | systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE} | ||
77 | fi | ||
78 | exit 1 | ||
79 | fi | 73 | fi |
80 | 74 | ||
81 | ${datadir}/sfcb/genSslCert.sh ${sysconfdir}/sfcb | 75 | ${datadir}/sfcb/genSslCert.sh ${sysconfdir}/sfcb |