search for: syslinux_fs_isolinux

...s/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;

...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 @@ bool is_gpxe(void) struct s_PXEN...

...->menuhide) m = hide_menu; + /* if HIDEIFNOT is specified , then send this entry to "hidden menu" until source doesn't match */ + if (ld->visiblesource){ + 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->ser...

...rgv[arg + 1]; + pxelinux.option = true; + } + if (!strcmp(argv[arg], "-sys-")) { + argv[arg] = NULL; + syslinux.arg[0] = &argv[arg + 1]; + syslinux.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"); usa...

...gt; 'Z') && (c < '0' || c > '9')) c = '_'; + buffer[i++] = c; + } + buffer[i] = 0; + return buffer; +} + +static const char *unrockridge_iso(const char *name) +{ + const struct syslinux_version *sv; + sv = syslinux_version(); + if (sv->filesystem != SYSLINUX_FS_ISOLINUX) { + return unrockridge(name); + } else { + return name; + } +} + +static uint8_t *md5_file(const char *filename) +{ + int src_fd, count; + uint8_t in_buf[4096]; + static uint8_t hash_value[16*2+1]; + static unsigned char hash[16]; + MD5_CTX context; + + src_fd = open(filename, O_RDONLY); + if (s...

...nst struct syslinux_version *sv; /* * Detect which variant of syslinux is running. */ int detect_syslinux() { sv = 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)); sys...

This is a bit updated set of chain.c32 changes that simplifies a few things (and in partiter part), fixes few minor issues and adds a few new features. Details are in the following commits, below is the summary and pull details at the end. Shao - any chance to peek over them ? Most of those are relatively simple changes and well tested, though of course something might have slipped my attention.