← Back to branch summary

~ubuntu-branches/ubuntu/wily/maas/wily-proposed

« back to all changes in this revision

Viewing changes to debian/patches/syslinux-pxelinux-paths.patch

  • Committer: Package Import Robot
  • Author(s): Steve Langasek
  • Date: 2015-03-18 11:11:47 UTC
  • Revision ID: package-import@ubuntu.com-20150318111147-xtd6juoylnfdkrot
Tags: 1.7.1+bzr3341-0ubuntu2
https://launchpad.net/bugs/1433697
Depend on pxelinux for pxelinux.0, not on syslinux-dev.  LP: #1433697.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/syslinux-pxelinux-paths.patch
 
1
Description: Depend on pxelinux for pxelinux.0, not on syslinux-dev.
 
2
Author: Steve Langasek <steve.langasek@ubuntu.com>
 
3
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1433697
 
4
 
 
5
--- maas-1.7.1+bzr3341.orig/src/provisioningserver/boot/pxe.py
 
6
+++ maas-1.7.1+bzr3341/src/provisioningserver/boot/pxe.py
 
7
@@ -34,7 +34,7 @@ BOOTLOADERS = ['pxelinux.0', 'chain.c32'
 
8
 # Possible locations in which to find the bootloader files. Search these
 
9
 # in this order for each file.  (This exists because locations differ
 
10
 # across Ubuntu releases.)
 
11
-BOOTLOADER_DIRS = ['/usr/lib/syslinux', '/usr/lib/syslinux/modules/bios']
 
12
+BOOTLOADER_DIRS = ['/usr/lib/PXELINUX', '/usr/lib/syslinux', '/usr/lib/syslinux/modules/bios']
 
13
 
 
14
 # List of possible directories where to find additioning bootloader files.
 
15
 # The first existing directory will be symlinked to /syslinux/ inside