summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/plugins/source/bootimg-efi.py
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/lib/wic/plugins/source/bootimg-efi.py')
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-efi.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 855bbc2ce2..e4067b6dbf 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -173,7 +173,6 @@ class BootimgEFIPlugin(SourcePlugin):
173 cr.set_bootimg_dir(bootimg_dir) 173 cr.set_bootimg_dir(bootimg_dir)
174 174
175 staging_kernel_dir = kernel_dir 175 staging_kernel_dir = kernel_dir
176 staging_data_dir = bootimg_dir
177 176
178 hdddir = "%s/hdd/boot" % cr_workdir 177 hdddir = "%s/hdd/boot" % cr_workdir
179 178
@@ -185,12 +184,12 @@ class BootimgEFIPlugin(SourcePlugin):
185 if source_params['loader'] == 'grub-efi': 184 if source_params['loader'] == 'grub-efi':
186 shutil.copyfile("%s/hdd/boot/EFI/BOOT/grub.cfg" % cr_workdir, 185 shutil.copyfile("%s/hdd/boot/EFI/BOOT/grub.cfg" % cr_workdir,
187 "%s/grub.cfg" % cr_workdir) 186 "%s/grub.cfg" % cr_workdir)
188 cp_cmd = "cp %s/EFI/BOOT/* %s/EFI/BOOT" % (staging_data_dir, hdddir) 187 cp_cmd = "cp %s/EFI/BOOT/* %s/EFI/BOOT" % (bootimg_dir, hdddir)
189 exec_cmd(cp_cmd, True) 188 exec_cmd(cp_cmd, True)
190 shutil.move("%s/grub.cfg" % cr_workdir, 189 shutil.move("%s/grub.cfg" % cr_workdir,
191 "%s/hdd/boot/EFI/BOOT/grub.cfg" % cr_workdir) 190 "%s/hdd/boot/EFI/BOOT/grub.cfg" % cr_workdir)
192 elif source_params['loader'] == 'gummiboot': 191 elif source_params['loader'] == 'gummiboot':
193 cp_cmd = "cp %s/EFI/BOOT/* %s/EFI/BOOT" % (staging_data_dir, hdddir) 192 cp_cmd = "cp %s/EFI/BOOT/* %s/EFI/BOOT" % (bootimg_dir, hdddir)
194 exec_cmd(cp_cmd, True) 193 exec_cmd(cp_cmd, True)
195 else: 194 else:
196 msger.error("unrecognized bootimg-efi loader: %s" % source_params['loader']) 195 msger.error("unrecognized bootimg-efi loader: %s" % source_params['loader'])