Merge remote-tracking branch 'origin/morty' into pyro

* origin/morty:

  6e3ac7b meta-qt5: update meta layer
  b250388 meta-qt5: update meta layer
  763a607 qtdeviceutilities: update revision
  0c1582c poky: update to latest revision in morty branch
  4489683 nuc: use modprobe to load kernel module
  45f1fec quickcompiler: Update QC to 5.9.5 version
  65f8274 nuc: enable boot from internal sd cardreader

Conflicts:
  meta-boot2qt/recipes-graphics/hunspell/hunspell-dicts_git.bb
  meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
  scripts/manifest.xml

Change-Id: I6fbfe531d34716aacb4a7220c4fc2688152651a2

1 files changed, 5 insertions, 0 deletions

diff --git a/meta-boot2qt/recipes-core/initramfs-basic/files/init.sh b/meta-boot2qt/recipes-core/initramfs-basic/files/init.sh
index 3db235b..94eb39b 100644
--- a/meta-boot2qt/recipes-core/initramfs-basic/files/init.sh
+++ b/meta-boot2qt/recipes-core/initramfs-basic/files/init.sh
@@ -96,6 +96,11 @@ main() {
 
     early_setup
     read_args
+
+    if [ -f init-device ]; then
+        source init-device
+    fi
+
     switch_real_root
 }