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

Use bootp packet to set prefix and card address.

Browse source
This commit is contained in:
Manoel Rebelo Abranches 2011-04-01 05:39:06 -03:00
parent 6d5c2ed68a
commit 59b361a2df
4 changed files with 77 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

19
grub-core/kern/ieee1275/init.c
View file

@ -31,6 +31,8 @@
#include <grub/ieee1275/console.h>
#include <grub/ieee1275/ofdisk.h>
#include <grub/ieee1275/ieee1275.h>
#include <grub/ieee1275/ofnet.h>
#include <grub/net.h>
#include <grub/offsets.h>
#include <grub/memory.h>
@ -74,7 +76,22 @@ grub_machine_set_prefix (void)
char bootpath[64]; /* XXX check length */
char *filename;
char *prefix;
grub_bootp_t bootp_pckt;
char addr[GRUB_NET_MAX_STR_ADDR_LEN];
/* Set the net prefix when possible. */
if (grub_getbootp && (bootp_pckt = grub_getbootp()))
{
grub_uint32_t n = bootp_pckt->siaddr;
grub_snprintf (addr, GRUB_NET_MAX_STR_ADDR_LEN, "%d.%d.%d.%d",
((n >> 24) & 0xff), ((n >> 16) & 0xff),
((n >> 8) & 0xff), ((n >> 0) & 0xff));
prefix = grub_xasprintf ("(tftp,%s)%s", addr,grub_prefix);
grub_env_set ("prefix", prefix);
grub_free (prefix);
return;
}
if (grub_prefix[0])
{
grub_env_set ("prefix", grub_prefix);

1
grub-core/kern/ieee1275/openfw.c
View file

@ -28,6 +28,7 @@
#include <grub/net/disknet.h>
#include <grub/net/tftp.h>
grub_bootp_t (*grub_getbootp) (void);
enum grub_ieee1275_parse_type
{
GRUB_PARSE_FILENAME,