diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-08-06 07:33:58 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-08-06 07:33:58 +0000 |
| commit | e03c1d25ca3251adbddd6f6741644d3228f40f85 (patch) | |
| tree | 24f1a8d044e502014d92401b27dc5101922733a4 | |
| parent | b5aa22b972e526b5fbb4f684d0d5821a4eefaefa (diff) | |
| download | poky-e03c1d25ca3251adbddd6f6741644d3228f40f85.tar.gz | |
update-rc.d.bbclass: Stop the class corrupting the D variable
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2369 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/classes/update-rc.d.bbclass | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index 9821eec5b2..cb217681e3 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass | |||
| @@ -7,17 +7,15 @@ INIT_D_DIR = "${sysconfdir}/init.d" | |||
| 7 | 7 | ||
| 8 | updatercd_postinst() { | 8 | updatercd_postinst() { |
| 9 | if test "x$D" != "x"; then | 9 | if test "x$D" != "x"; then |
| 10 | D="-r $D" | 10 | OPT="-r $D" |
| 11 | else | 11 | else |
| 12 | D="-s" | 12 | OPT="-s" |
| 13 | fi | 13 | fi |
| 14 | update-rc.d $D ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} | 14 | update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} |
| 15 | } | 15 | } |
| 16 | 16 | ||
| 17 | updatercd_prerm() { | 17 | updatercd_prerm() { |
| 18 | if test "x$D" != "x"; then | 18 | if test "x$D" == "x"; then |
| 19 | D="-r $D" | ||
| 20 | else | ||
| 21 | ${INIT_D_DIR}/${INITSCRIPT_NAME} stop | 19 | ${INIT_D_DIR}/${INITSCRIPT_NAME} stop |
| 22 | fi | 20 | fi |
| 23 | } | 21 | } |
