summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-07-29 13:36:42 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-07-29 13:36:42 +0000
commite035f3faab1c98f8a2f33a8640915f849166c745 (patch)
tree8002ea9c62f1bb22a411721111fc6f75bf50fb9e /classes
parent54f03c234b08648e8dea36c920bfb4d666ae1b40 (diff)
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)
Diffstat (limited to 'classes')
-rw-r--r--classes/update-rc.d.bbclass8
1 files changed, 5 insertions, 3 deletions
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: