Merge lp:~rvb/maas/fix-bootloader-path into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Fix bootloader locations.

Since the path to the bootloaders differs between releases, we just introduced a way to iterate over a list of possible locations (see https://code.launchpad.net/~julian-edwards/maas/utopic-syslinux-location/+merge/223851). Unfortunately, the path for Utopic was wrong: http://paste.ubuntu.com/7674610/. (For reference, this is for Trusty: http://paste.ubuntu.com/7674618/.) This branch fixes it.

[Graham Binns (gmb)]

review: Approve

[Julian Edwards (julian-edwards)]

On 20/06/14 23:36, Raphaël Badin wrote:
> -BOOTLOADER_DIRS = ['/usr/lib/syslinux', '/usr/lib/syslinux/bios']
> +# Ubuntu releases.)
> +BOOTLOADER_DIRS = ['/usr/lib/syslinux', '/usr/lib/syslinux/modules/bios']
>

Wow, this must have changed recently, because I ran up a utopic
Canonistack instance and verified where the file was!

=== modified file 'src/provisioningserver/boot/pxe.py'
--- src/provisioningserver/boot/pxe.py	2014-06-20 03:07:03 +0000
+++ src/provisioningserver/boot/pxe.py	2014-06-20 13:32:10 +0000
@@ -32,8 +32,8 @@
 
 # Possible locations in which to find the files. Search these in this
 # order for each file.  (This exists because locations differ across
-# Ubuntu releases)
-BOOTLOADER_DIRS = ['/usr/lib/syslinux', '/usr/lib/syslinux/bios']
+# Ubuntu releases.)
+BOOTLOADER_DIRS = ['/usr/lib/syslinux', '/usr/lib/syslinux/modules/bios']
 
 
 class ARP_HTYPE: