From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 29 Jul 2008 13:36:42 +0000 (+0000)
Subject: make sure update-rc is always executed in an offline postinst (from poky r4976)
X-Git-Tag: Release-2010-05/1~6442
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e035f3faab1c98f8a2f33a8640915f849166c745;p=openembedded.git

make sure update-rc is always executed in an offline postinst (from poky r4976)
(Note: This fixes (among other things) dbus not being started on first boot)
---

diff --git a/classes/update-rc.d.bbclass b/classes/update-rc.d.bbclass
index 3051b7933f..9b832c0012 100644
--- a/classes/update-rc.d.bbclass
+++ b/classes/update-rc.d.bbclass
@@ -45,10 +45,12 @@ python populate_packages_prepend () {
 		bb.data.setVar("OVERRIDES", "%s:%s" % (pkg, overrides), localdata)
 		bb.data.update_data(localdata)
 
-		postinst = bb.data.getVar('pkg_postinst', localdata, 1)
-		if not postinst:
-			postinst = '#!/bin/sh\n'
+		postinst = '#!/bin/sh\n'
 		postinst += bb.data.getVar('updatercd_postinst', localdata, 1)
+		try:
+			postinst += bb.data.getVar('pkg_postinst', localdata, 1)
+		except:
+			pass
 		bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)
 		prerm = bb.data.getVar('pkg_prerm', localdata, 1)
 		if not prerm: