search for: syslinux_fs_pxelinux

...| 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/com32/include/syslinux/config.h b/com32/include/syslinux/config.h index 868b0f1..2874665 100644 --- a/com32/include/syslinux/config.h +++ b/com32/include/syslinux/config.h @@ -44,6 +44,7 @@ enum syslinux_filesystem { SYSLINUX_FS_PXELINUX = 0x32, SYSLINUX_FS_ISOLINUX = 0x33, SYSLINUX_FS_EXTLINUX = 0x34, + SYSLINUX_FS_GPXE = 0x46, }; struct syslinux_version { diff --git a/com32/lib/sys/gpxe.c b/com32/lib/sys/gpxe.c index fae03f8..1b01abc 100644 --- a/com32/lib/sys/gpxe.c +++ b/com32/lib/sys/gpxe.c @@ -9,8 +9,8 @@ boo...

...009-07-19 20:33:16.468094540 +0200 +++ ./com32/modules/chain.c.new 2009-07-19 20:26:54.636091513 +0200 @@ -666,8 +666,7 @@ } else if (!strcmp(drivename, "boot")) { const union syslinux_derivative_info *sdi; sdi = syslinux_derivative_info(); - if (sdi->c.filesystem == SYSLINUX_FS_PXELINUX || - sdi->c.filesystem == SYSLINUX_FS_ISOLINUX) + if (sdi->c.filesystem == SYSLINUX_FS_PXELINUX ) drive = 0x80; /* Boot drive not available */ else drive = sdi->disk.drive_number;

...com32/mboot/mboot.c +++ b/com32/mboot/mboot.c @@ -224,6 +224,14 @@ int main(int argc, char *argv[]) mboot_apm(); mboot_syslinux_info(); + /* Set boot device info */ + const union syslinux_derivative_info *sdi; + sdi = syslinux_derivative_info(); + if (sdi->c.filesystem != SYSLINUX_FS_PXELINUX) { + mbinfo.boot_device = (sdi->disk.drive_number << 24) | 0xffffff; + mbinfo.flags |= MB_INFO_BOOTDEV; + } + if (opt.solaris) mboot_solaris_dhcp_hack();

...t memlimit = 0; > uint16_t video_mode = 0; > + uint8_t bootflags = 0; > const char *arg; > > cmdline_size = strlen(cmdline) + 1; > @@ -200,6 +204,14 @@ int bios_boot_linux(void *kernel_buf, si > } > } > > + if (syslinux_filesystem() == SYSLINUX_FS_PXELINUX && > + find_argument(cmdline, "keeppxe")) { > + extern __weak char KeepPXE; > + > + KeepPXE = 1; /* for pxelinux_scan_memory */ > + bootflags = 3; /* for unload_pxe */ > + } > + > /* Copy the header into...

...struct syslinux_memmap *amap = NULL; uint32_t memlimit = 0; uint16_t video_mode = 0; + uint8_t bootflags = 0; const char *arg; cmdline_size = strlen(cmdline) + 1; @@ -200,6 +204,14 @@ int bios_boot_linux(void *kernel_buf, si } } + if (syslinux_filesystem() == SYSLINUX_FS_PXELINUX && + find_argument(cmdline, "keeppxe")) { + extern __weak char KeepPXE; + + KeepPXE = 1; /* for pxelinux_scan_memory */ + bootflags = 3; /* for unload_pxe */ + } + /* Copy the header into private storage */ /* Use whdr to modify the actual kernel header */...

...sdi = syslinux_derivative_info(); + uint32_t srvip; + char strsrvip[50]; + switch (sdi->c.filesystem) { + case SYSLINUX_FS_ISOLINUX: + if (strcmp(ld->visiblesource, "ISO")!=0) // if booting from CD and ISO is not specified => hide + m = hide_menu; + break; + case SYSLINUX_FS_PXELINUX: // if booting from pxe and tftp sever IP address doesn't match => hide + srvip = sdi->pxe.ipinfo->serverip; + sprintf(strsrvip,"%u.%u.%u.%u",((uint8_t *)&srvip)[0], ((uint8_t *)&srvip)[1], ((uint8_t *)&srvip)[2], ((uint8_t *)&srvip)[3]); + if (strcmp...

...inux.option = true; + } + arg++; + } + + sdi = syslinux_derivative_info(); + + switch (sdi->c.filesystem) { + case SYSLINUX_FS_ISOLINUX: + isolinux.option ? boot_args(isolinux.arg[0]) : fprintf(stderr, "No command specified for ISOLINUX.\n\n"); usage(); + break; + case SYSLINUX_FS_PXELINUX: + pxelinux.option ? boot_args(pxelinux.arg[0]) : fprintf(stderr, "No command specified for PXELINUX.\n\n"); usage(); + break; + case SYSLINUX_FS_SYSLINUX: + syslinux.option ? boot_args(syslinux.arg[0]) : fprintf(stderr, "No command specified for SYSLINUX.\n\n"); usa...

...syslinux_version(); switch (sv->filesystem) { case SYSLINUX_FS_EXTLINUX: strncpy(bootlinux,extlinux,sizeof(bootlinux)); extlinux_param=true; break; case SYSLINUX_FS_ISOLINUX: strncpy(bootlinux,isolinux,sizeof(bootlinux)); isolinux_param=true; break; case SYSLINUX_FS_PXELINUX: strncpy(bootlinux,pxelinux,sizeof(bootlinux)); pxelinux_param=true; break; case SYSLINUX_FS_SYSLINUX: strncpy(bootlinux,syslinux,sizeof(bootlinux)); syslinux_param=true; break; case SYSLINUX_FS_UNKNOWN: default: return 1; } return 0; } /* * Detect...

...} > > -EFI_HANDLE image_handle; > +EFI_HANDLE image_handle, pxe_handle; > > static inline UINT64 round_up(UINT64 x, UINT64 y) > { > @@ -1295,6 +1286,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *table) > } else { > efi_derivative(SYSLINUX_FS_PXELINUX); > ops[0] = &pxe_fs_ops; > + pxe_handle = info->DeviceHandle; > } > > /* setup timer for boot menu system support */ > diff --git a/efi/pxe.c b/efi/pxe.c > index 443ab47..82cdee4 100644 > --- a/efi/pxe.c > +++ b/efi/px...

From: Matt Fleming <matt.fleming at intel.com> Since we can't use __intcall() for EFI, and since we can now have the ELF module code resolve all our symbols at runtime, we should delete as many references to __intcall() as possible and just access the symbols directly. The most interesting patch is the support for weak symbols. We need to be able to reference derivative-specific

...el_type type) * superblock. */ if (sdi->c.filesystem == SYSLINUX_FS_SYSLINUX && - type == KT_BSS && this_fs->fs_ops->copy_super(buf)) + type == IMAGE_TYPE_BSS && this_fs->fs_ops->copy_super(buf)) goto bail; if (sdi->c.filesystem == SYSLINUX_FS_PXELINUX) { diff --git a/com32/elflink/ldlinux/config.h b/com32/elflink/ldlinux/config.h index 4583202..ea4736e 100644 --- a/com32/elflink/ldlinux/config.h +++ b/com32/elflink/ldlinux/config.h @@ -47,4 +47,6 @@ extern int new_linux_kernel(char *okernel, char *ocmdline); extern void pm_load_high(com32sys_...

...char *file, enum kernel_type type) * superblock. */ if (sdi->c.filesystem == SYSLINUX_FS_SYSLINUX && - type == KT_BSS && vfat_copy_superblock(buf)) + type == KT_BSS && this_fs->fs_ops->copy_super(buf)) goto bail; if (sdi->c.filesystem == SYSLINUX_FS_PXELINUX) { diff --git a/com32/elflink/ldlinux/execute.c b/com32/elflink/ldlinux/execute.c index 97e5116..f713eb1 100644 --- a/com32/elflink/ldlinux/execute.c +++ b/com32/elflink/ldlinux/execute.c @@ -92,7 +92,6 @@ void execute(const char *cmdline, enum kernel_type type) if (type == KT_COM32) { /* ne...

So last week I was wondering if XFS was still working -- even with its last on-disk structure changes -- and it _suprisingly_ worked as expected. Right, now I can finally get rid of GRUB and use Syslinux to boot my Linux on EFI from a rootfs with xfs. Shit, I have two partitions (the first one being the required ESP) so there is no way to access the other partitions since because Syslinux does not