summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-08-06 07:33:58 +0000
committerRichard Purdie <richard@openedhand.com>2007-08-06 07:33:58 +0000
commite03c1d25ca3251adbddd6f6741644d3228f40f85 (patch)
tree24f1a8d044e502014d92401b27dc5101922733a4
parentb5aa22b972e526b5fbb4f684d0d5821a4eefaefa (diff)
downloadpoky-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.bbclass10
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
8updatercd_postinst() { 8updatercd_postinst() {
9if test "x$D" != "x"; then 9if test "x$D" != "x"; then
10 D="-r $D" 10 OPT="-r $D"
11else 11else
12 D="-s" 12 OPT="-s"
13fi 13fi
14update-rc.d $D ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} 14update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
15} 15}
16 16
17updatercd_prerm() { 17updatercd_prerm() {
18if test "x$D" != "x"; then 18if test "x$D" == "x"; then
19 D="-r $D"
20else
21 ${INIT_D_DIR}/${INITSCRIPT_NAME} stop 19 ${INIT_D_DIR}/${INITSCRIPT_NAME} stop
22fi 20fi
23} 21}