release 3.5-pre1
https://sourceforge.net/projects/elilo/files/elilo/elilo-3.5pre1/
This commit is contained in:
parent
fb6ce0d596
commit
cb533a5de5
25 changed files with 2583 additions and 477 deletions
57
glue_netfs.c
57
glue_netfs.c
|
@ -117,7 +117,7 @@ netfs_set_default_path(netfs_interface_t *netfs, netfs_info_t *info)
|
|||
}
|
||||
|
||||
static EFI_STATUS
|
||||
netfs_setdefaults(VOID *intf, CHAR16 *config, CHAR16 *kname, UINTN maxlen, CHAR16 *devpath)
|
||||
netfs_setdefaults(VOID *intf, config_file_t *config, CHAR16 *kname, UINTN maxlen, CHAR16 *devpath)
|
||||
{
|
||||
netfs_interface_t *netfs = (netfs_interface_t *)intf;
|
||||
netfs_info_t info;
|
||||
|
@ -149,10 +149,10 @@ netfs_setdefaults(VOID *intf, CHAR16 *config, CHAR16 *kname, UINTN maxlen, CHAR1
|
|||
set_var(VAR_NETFS_DOMAINAME, info.domainame);
|
||||
|
||||
if (info.using_pxe) {
|
||||
status = netfs->netfs_query_layer(netfs, 0, NETFS_CONFIG_LAYER, maxlen, config);
|
||||
status = netfs->netfs_query_layer(netfs, 0, NETFS_CONFIG_LAYER, maxlen, config[0].fname);
|
||||
if (EFI_ERROR(status)) {
|
||||
StrnCpy(config, NETFS_DEFAULT_CONFIG, maxlen-1);
|
||||
config[maxlen-1] = CHAR_NULL;
|
||||
StrnCpy(config[0].fname, NETFS_DEFAULT_CONFIG, maxlen-1);
|
||||
config[0].fname[maxlen-1] = CHAR_NULL;
|
||||
}
|
||||
|
||||
status = netfs->netfs_query_layer(netfs, 0, NETFS_KERNEL_LAYER, maxlen, kname);
|
||||
|
@ -162,21 +162,44 @@ netfs_setdefaults(VOID *intf, CHAR16 *config, CHAR16 *kname, UINTN maxlen, CHAR1
|
|||
}
|
||||
} else {
|
||||
#ifdef ENABLE_MACHINE_SPECIFIC_NETCONFIG
|
||||
/*
|
||||
* will try a machine specific file first.
|
||||
* the file is constructed based on the IP(v4) address
|
||||
*/
|
||||
convert_ip2hex(ipaddr, m, config);
|
||||
|
||||
config[8] = L'.';
|
||||
config[9] = L'c';
|
||||
config[10] = L'o';
|
||||
config[11] = L'n';
|
||||
config[12] = L'f';
|
||||
config[13] = CHAR_NULL;
|
||||
# if defined(CONFIG_ia64)
|
||||
# define CONFIG_ARCH_EXTENSION L"-ia64.conf\0"
|
||||
# elif defined (CONFIG_ia32)
|
||||
# define CONFIG_ARCH_EXTENSION L"-ia64.conf\0"
|
||||
# else
|
||||
# error "You need to specfy your default arch config file"
|
||||
# endif
|
||||
|
||||
# define CONFIG_EXTENSION L".conf\0"
|
||||
/*
|
||||
* will try machine/subnet specific files first.
|
||||
* the filenames are constructed based on the IP(v4) address
|
||||
*/
|
||||
convert_ip2hex(ipaddr, m, str);
|
||||
StrnCpy(config[0].fname, str, maxlen-1);
|
||||
StrnCpy(config[0].fname+8, CONFIG_EXTENSION, 6);
|
||||
|
||||
StrnCpy(config[1].fname, str, maxlen-1);
|
||||
StrnCpy(config[1].fname+6, CONFIG_ARCH_EXTENSION, 11);
|
||||
|
||||
StrnCpy(config[2].fname, str, maxlen-1);
|
||||
StrnCpy(config[2].fname+6, CONFIG_EXTENSION, 6);
|
||||
|
||||
StrnCpy(config[3].fname, str, maxlen-1);
|
||||
StrnCpy(config[3].fname+4, CONFIG_ARCH_EXTENSION, 11);
|
||||
|
||||
StrnCpy(config[4].fname, str, maxlen-1);
|
||||
StrnCpy(config[4].fname+4, CONFIG_EXTENSION, 6);
|
||||
|
||||
StrnCpy(config[5].fname, str, maxlen-1);
|
||||
StrnCpy(config[5].fname+2, CONFIG_ARCH_EXTENSION, 11);
|
||||
|
||||
StrnCpy(config[6].fname, str, maxlen-1);
|
||||
StrnCpy(config[6].fname+2, CONFIG_EXTENSION, 6);
|
||||
#else
|
||||
StrnCpy(config, NETFS_DEFAULT_CONFIG, maxlen-1);
|
||||
config[maxlen-1] = CHAR_NULL;
|
||||
StrnCpy(config[0].fname, NETFS_DEFAULT_CONFIG, maxlen-1);
|
||||
config[0].fname[maxlen-1] = CHAR_NULL;
|
||||
#endif
|
||||
StrnCpy(kname, NETFS_DEFAULT_KERNEL, maxlen-1);
|
||||
kname[maxlen-1] = CHAR_NULL;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue