* fs/i386/pc/pxe.c (grub_pxe_open): Fix parsing of gateway_ip.

diff --git a/ChangeLog b/ChangeLog
index f9a0d2424b7a17ef7063f94a9b65ee480125c162..b8f5f80d8981bff09899ec8b62efe3c96f8dd478 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
+
+       * fs/i386/pc/pxe.c (grub_pxe_open): Fix parsing of gateway_ip.
+
 2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
 
        * docs/grub.texi (Network): New section.

diff --git a/fs/i386/pc/pxe.c b/fs/i386/pc/pxe.c
index 82d8ee583db2f406e8c29520bd687d9e3a7c4e89..e4d481a8e14ce5f03bfc7f6fe2b1a9a18f3ae770 100644 (file)
--- a/fs/i386/pc/pxe.c
+++ b/fs/i386/pc/pxe.c
@@ -114,7 +114,7 @@ grub_pxe_open (const char *name, grub_disk_t disk)
        return err;
       if (*ptr == ':')
        {
-         err = parse_ip (ptr + 1, &(data->server_ip), 0);
+         err = parse_ip (ptr + 1, &(data->gateway_ip), 0);
          if (err)
            return err;
        }