From 35562686174910752468000e15762c67e44db973 Mon Sep 17 00:00:00 2001 From: James Thomas Date: Thu, 14 Jan 2016 14:40:17 +0000 Subject: Opearate on the temp root when looking for menu.c32 It's possible we'll be generating the bootloader configuration on a partition that doesn't have the root filing system, so grap this file from the extracted rootfs instead Change-Id: I7a599654c2686f554e54aee069dd38200ab9e915 --- extensions/writeexts.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/writeexts.py b/extensions/writeexts.py index f60458ce..16d05664 100644 --- a/extensions/writeexts.py +++ b/extensions/writeexts.py @@ -495,7 +495,7 @@ class WriteExtension(Extension): self.install_kernel(version_root, temp_root) if self.get_dtb_path() != '': self.install_dtb(version_root, temp_root) - self.install_syslinux_menu(mountpoint, version_root) + self.install_syslinux_menu(mountpoint, temp_root) if initramfs is not None: # Using initramfs - can boot a rootfs with a filesystem UUID self.install_initramfs(initramfs, version_root) @@ -862,7 +862,7 @@ class WriteExtension(Extension): 'architecture? The MBR blob will only be built for x86' 'systems. You may wish to configure BOOTLOADER_INSTALL') - def install_syslinux_menu(self, real_root, version_root): + def install_syslinux_menu(self, real_root, temp_root): '''Make syslinux/extlinux menu binary available. The syslinux boot menu is compiled to a file named menu.c32. Extlinux @@ -873,8 +873,8 @@ class WriteExtension(Extension): not be able to show a menu. ''' - menu_file = os.path.join(version_root, 'orig', - 'usr', 'share', 'syslinux', 'menu.c32') + menu_file = os.path.join(temp_root, 'usr', 'share', 'syslinux', + 'menu.c32') if os.path.isfile(menu_file): self.status(msg='Copying menu.c32') shutil.copy(menu_file, real_root) -- cgit v1.2.1