[oe-commits] org.oe.dev update-rc.d: merge in ${D} cleanups from poky

[koen commit]

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

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 0bb67ca8b729200534e9fda164dd38051ee0ec16
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0bb67ca8b729200534e9fda164dd38051ee0ec16
Files:
1
classes/update-rc.d.bbclass
Diffs:

#
# mt diff -r583da5d8f9198c190ede6cca8f23e687b2f104a9 -r0bb67ca8b729200534e9fda164dd38051ee0ec16
#
# 
# 
# patch "classes/update-rc.d.bbclass"
#  from [8812f2d73cbeef9536c5598c2f3c1888e35b0aa3]
#    to [aad4a9f7c2ea238e727751a6fd3e2675923cc9be]
# 
============================================================
--- classes/update-rc.d.bbclass	8812f2d73cbeef9536c5598c2f3c1888e35b0aa3
+++ classes/update-rc.d.bbclass	aad4a9f7c2ea238e727751a6fd3e2675923cc9be
@@ -7,17 +7,15 @@ if test "x$D" != "x"; then
 
 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
 }