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 3051b79..9b832c0 100644 (file)
--- 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: