diff options
| -rw-r--r-- | meta/classes/update-rc.d.bbclass | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index d44d36cb5b..e14659d118 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass | |||
| @@ -13,15 +13,13 @@ INITSCRIPT_PARAMS ?= "defaults" | |||
| 13 | INIT_D_DIR = "${sysconfdir}/init.d" | 13 | INIT_D_DIR = "${sysconfdir}/init.d" |
| 14 | 14 | ||
| 15 | updatercd_postinst() { | 15 | updatercd_postinst() { |
| 16 | IN_TARGET=`test "x$D" = "x"` | ||
| 17 | |||
| 18 | # test if there is a previous init script there, ie, we are updating the package | 16 | # test if there is a previous init script there, ie, we are updating the package |
| 19 | # if so, we stop the service and remove it before we install from the new package | 17 | # if so, we stop the service and remove it before we install from the new package |
| 20 | if type update-rc.d >/dev/null 2>/dev/null; then | 18 | if type update-rc.d >/dev/null 2>/dev/null; then |
| 21 | if [ $IN_TARGET -a `test -f "${INIT_D_DIR}/${INITSCRIPT_NAME}"` ]; then | 19 | if [ -z "$D" -a `test -f "${INIT_D_DIR}/${INITSCRIPT_NAME}"` ]; then |
| 22 | ${INIT_D_DIR}/${INITSCRIPT_NAME} stop | 20 | ${INIT_D_DIR}/${INITSCRIPT_NAME} stop |
| 23 | fi | 21 | fi |
| 24 | if [ ! $IN_TARGET ]; then | 22 | if [ -n "$D" ]; then |
| 25 | OPT="-f -r $D" | 23 | OPT="-f -r $D" |
| 26 | else | 24 | else |
| 27 | OPT="-f" | 25 | OPT="-f" |
| @@ -29,7 +27,7 @@ if type update-rc.d >/dev/null 2>/dev/null; then | |||
| 29 | update-rc.d $OPT ${INITSCRIPT_NAME} remove | 27 | update-rc.d $OPT ${INITSCRIPT_NAME} remove |
| 30 | fi | 28 | fi |
| 31 | 29 | ||
| 32 | if [ ! $IN_TARGET ]; then | 30 | if [ -n "$D" ]; then |
| 33 | OPT="-r $D" | 31 | OPT="-r $D" |
| 34 | else | 32 | else |
| 35 | OPT="-s" | 33 | OPT="-s" |
