diff options
Diffstat (limited to 'scripts/lib/wic/plugins/source')
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-efi.py | 5 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-pcbios.py | 3 |
2 files changed, 3 insertions, 5 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']) |
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index 6057bab42d..8a1aca1ad1 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py | |||
@@ -144,7 +144,6 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
144 | cr.set_bootimg_dir(bootimg_dir) | 144 | cr.set_bootimg_dir(bootimg_dir) |
145 | 145 | ||
146 | staging_kernel_dir = kernel_dir | 146 | staging_kernel_dir = kernel_dir |
147 | staging_data_dir = bootimg_dir | ||
148 | 147 | ||
149 | hdddir = "%s/hdd/boot" % cr_workdir | 148 | hdddir = "%s/hdd/boot" % cr_workdir |
150 | 149 | ||
@@ -153,7 +152,7 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
153 | exec_cmd(install_cmd) | 152 | exec_cmd(install_cmd) |
154 | 153 | ||
155 | install_cmd = "install -m 444 %s/syslinux/ldlinux.sys %s/ldlinux.sys" \ | 154 | install_cmd = "install -m 444 %s/syslinux/ldlinux.sys %s/ldlinux.sys" \ |
156 | % (staging_data_dir, hdddir) | 155 | % (bootimg_dir, hdddir) |
157 | exec_cmd(install_cmd) | 156 | exec_cmd(install_cmd) |
158 | 157 | ||
159 | du_cmd = "du -bks %s" % hdddir | 158 | du_cmd = "du -bks %s" % hdddir |