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 /meta/classes | |
| parent | b5aa22b972e526b5fbb4f684d0d5821a4eefaefa (diff) | |
| download | openembedded-core-e03c1d25ca3251adbddd6f6741644d3228f40f85.tar.gz openembedded-core-e03c1d25ca3251adbddd6f6741644d3228f40f85.tar.bz2 openembedded-core-e03c1d25ca3251adbddd6f6741644d3228f40f85.zip | |
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
Diffstat (limited to 'meta/classes')
| -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" updatercd_postinst() { if test "x$D" != "x"; then - D="-r $D" + OPT="-r $D" else - D="-s" + OPT="-s" fi -update-rc.d $D ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} +update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} } updatercd_prerm() { -if test "x$D" != "x"; then - D="-r $D" -else +if test "x$D" == "x"; then ${INIT_D_DIR}/${INITSCRIPT_NAME} stop fi } |