[oe-commits] [openembedded-core] 25/56: wic: bootimg-efi: include startup.nsh if it's available

git at git.openembedded.org git at git.openembedded.org
Mon May 30 08:38:48 UTC 2016


rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit aa215c12d729c001ad3b8b98a7e203a9ad192211
Author: Christopher Larson <chris_larson at mentor.com>
AuthorDate: 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]
    
    Signed-off-by: Christopher Larson <chris_larson at mentor.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 scripts/lib/wic/plugins/source/bootimg-efi.py | 5 +++++
 1 file changed, 5 insertions(+)

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])

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list