From: Koen Kooi <koen@openembedded.org>
Date: Wed, 8 Aug 2007 13:42:50 +0000 (+0000)
Subject: update-rc.d: merge in ${D} cleanups from poky
X-Git-Tag: Release-2010-05/1~9076^2~4^2~6^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aafc991015bccabfa1f03cac6ea8b7790c68a50f;p=openembedded.git

update-rc.d: merge in ${D} cleanups from poky
---

diff --git a/classes/update-rc.d.bbclass b/classes/update-rc.d.bbclass
index 9821eec5b2..3051b7933f 100644
--- a/classes/update-rc.d.bbclass
+++ b/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
 }