src/patches/dnsmasq/001-Fix_error_in_PXE_arch_names_and_add_ARM32_and_ARM64.patch

   1 From 68bea10bbfbd5e9ff158ab163c15d8982620d0d3 Mon Sep 17 00:00:00 2001
   2 From: Simon Kelley <simon@thekelleys.org.uk>
   3 Date: Wed, 11 May 2016 22:15:06 +0100
   4 Subject: [PATCH] Fix error in PXE arch names and add ARM32 and ARM64.
   5
   6 ---
   7  CHANGELOG     |   10 +++++++++-
   8  man/dnsmasq.8 |    2 +-
   9  src/option.c  |    3 ++-
  10  3 files changed, 12 insertions(+), 3 deletions(-)
  11
  12 diff --git a/CHANGELOG b/CHANGELOG
  13 index f3220d8..7012918 100644
  14 --- a/CHANGELOG
  15 +++ b/CHANGELOG
  16 @@ -74,7 +74,15 @@ version 2.76
  17             To avoid filling logs in configurations which define
  18             many upstream nameservers, don't log more that 30 servers.
  19             The number to be logged can be changed as SERVERS_LOGGED
  20 -           in src/config.h.
  21 +           in src/config.h.
  22 +
  23 +           Swap the values if BC_EFI and x86-64_EFI in --pxe-service.
  24 +           These were previously wrong due to an error in RFC 4578.
  25 +           If you're using BC_EFI to boot 64-bit EFI machines, you
  26 +           will need to update your config.
  27 +
  28 +           Add ARM32_EFI and ARM64_EFI as valid architectures in
  29 +           --pxe-service.
  30
  31
  32  version 2.75
  33 diff --git a/man/dnsmasq.8 b/man/dnsmasq.8
  34 index dacd9ce..68d77a2 100644
  35 --- a/man/dnsmasq.8
  36 +++ b/man/dnsmasq.8
  37 @@ -1358,7 +1358,7 @@ functions when supported by a suitable DHCP server.
  38  This specifies a boot option which may appear in a PXE boot menu. <CSA> is
  39  client system type, only services of the correct type will appear in a
  40  menu. The known types are x86PC, PC98, IA64_EFI, Alpha, Arc_x86,
  41 -Intel_Lean_Client, IA32_EFI, BC_EFI, Xscale_EFI and X86-64_EFI; an
  42 +Intel_Lean_Client, IA32_EFI,  X86-64_EFI, Xscale_EFI, BC_EFI, ARM32_EFI and ARM64_EFI; an
  43  integer may be used for other types. The
  44  parameter after the menu text may be a file name, in which case dnsmasq acts as a
  45  boot server and directs the PXE client to download the file by TFTP,
  46 diff --git a/src/option.c b/src/option.c
  47 index 0b35500..d8c57d6 100644
  48 --- a/src/option.c
  49 +++ b/src/option.c
  50 @@ -3298,7 +3298,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
  51         {
  52          struct pxe_service *new = opt_malloc(sizeof(struct pxe_service));
  53          char *CSA[] = { "x86PC", "PC98", "IA64_EFI", "Alpha", "Arc_x86", "Intel_Lean_Client",
  54 -                        "IA32_EFI", "BC_EFI", "Xscale_EFI", "x86-64_EFI", NULL };
  55 +                        "IA32_EFI", "x86-64_EFI", "Xscale_EFI", "BC_EFI",
  56 +                        "ARM32_EFI", "ARM64_EFI", NULL };
  57          static int boottype = 32768;
  58
  59          new->netid = NULL;
  60 --
  61 1.7.10.4
  62