[gnome-continuous-yocto/gnomeostree-3.28-rocko: 532/8267] wic: bootimg-efi: include startup.nsh if it's available

[Emmanuele Bassi <ebassi src gnome org>]

commit 91488e9630d0871a2ef7c786af67903776a8711f
Author: Christopher Larson <chris_larson mentor com>
Date:   Wed May 25 13:31:52 2016 -0700

    wic: bootimg-efi: include startup.nsh if it's available
    
    We want the system to boot on its own, rather than the user having to manually
    input the correct file at the EFI prompt.
    
    [YOCTO #9556]
    
    (From OE-Core rev: aa215c12d729c001ad3b8b98a7e203a9ad192211)
    
    Signed-off-by: Christopher Larson <chris_larson mentor com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/plugins/source/bootimg-efi.py |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index a4734c9..ec13f6d 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -197,6 +197,11 @@ class BootimgEFIPlugin(SourcePlugin):
         except KeyError:
             msger.error("bootimg-efi requires a loader, none specified")
 
+        startup = os.path.join(bootimg_dir, "startup.nsh")
+        if os.path.exists(startup):
+            cp_cmd = "cp %s %s/" % (startup, hdddir)
+            exec_cmd(cp_cmd, True)
+
         du_cmd = "du -bks %s" % hdddir
         out = exec_cmd(du_cmd)
         blocks = int(out.split()[0])