vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #6 from coreos/gnu

Browse source 
Merge upstream GRUB changes
This commit is contained in:
Michael Marineau 2014-11-23 17:58:18 -07:00
commit b97f2fa47e
4 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
2014-11-20 Andrei Borzenkov <arvidjaar@gmail.com>
* tests/util/grub-fs-tester.in: Consistently print output
of grub ls if test fails.
2014-11-07 Leif Lindholm <leif.lindholm@linaro.org>
* grub-core/kern/efi/init.c: check value of *path before
dereferencing.
2014-11-03 Michael Chang <mchang@suse.com>
* grub-core/net/icmp6.c (grub_net_recv_icmp6_packet): Fix size
of neighbor solicitation packet in grub_netbuff_pull.
2014-10-14 Andrei Borzenkov <arvidjaar@gmail.com> 2014-10-14 Andrei Borzenkov <arvidjaar@gmail.com>
* grub-core/loader/arm/linux.c: Use full initializer for initrd_ctx to * grub-core/loader/arm/linux.c: Use full initializer for initrd_ctx to

11
grub-core/kern/efi/init.c
View file

@ -63,10 +63,13 @@ grub_machine_get_bootlocation (char **device, char **path)
if (!*device && grub_efi_net_config) if (!*device && grub_efi_net_config)
grub_efi_net_config (image->device_handle, device, path); grub_efi_net_config (image->device_handle, device, path);
/* Get the directory. */ if (*path)
p = grub_strrchr (*path, '/'); {
if (p) /* Get the directory. */
*p = '\0'; p = grub_strrchr (*path, '/');
if (p)
*p = '\0';
}
} }
void void

2
grub-core/net/icmp6.c
View file

@ -205,7 +205,7 @@ grub_net_recv_icmp6_packet (struct grub_net_buff *nb,
if (ttl != 0xff) if (ttl != 0xff)
break; break;
nbh = (struct neighbour_solicit *) nb->data; nbh = (struct neighbour_solicit *) nb->data;
err = grub_netbuff_pull (nb, sizeof (struct router_adv)); err = grub_netbuff_pull (nb, sizeof (*nbh));
if (err) if (err)
{ {
grub_netbuff_free (nb); grub_netbuff_free (nb);

2
tests/util/grub-fs-tester.in
View file

@ -1067,6 +1067,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
: :
else else
echo NLIST FAIL echo NLIST FAIL
echo "$LSROUT"
TZ=UTC ls --time-style=+%Y%m%d%H%M%S.%N -lA "$MNTPOINTRO" TZ=UTC ls --time-style=+%Y%m%d%H%M%S.%N -lA "$MNTPOINTRO"
exit 1 exit 1
fi fi
@ -1084,6 +1085,7 @@ for ((LOGSECSIZE=MINLOGSECSIZE;LOGSECSIZE<=MAXLOGSECSIZE;LOGSECSIZE=LOGSECSIZE +
: :
else else
echo LONG LIST FAIL echo LONG LIST FAIL
echo "$LSROUT"
TZ=UTC ls --time-style=+%Y%m%d%H%M%S.%N -l "$MNTPOINTRO" TZ=UTC ls --time-style=+%Y%m%d%H%M%S.%N -l "$MNTPOINTRO"
exit 1 exit 1
fi fi