aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-07-27 11:15:43 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-07-27 11:15:43 -0700
commitf4b44a7b44faf9bcc345153f3ba23cabc68135da (patch)
tree657656b54205da14b85918142b2e0f9cdc027ba9
parent26f0dd1d698f332a9a095ba59e8ccbb633ce6a1f (diff)
parentaa2ebf33acd1b8a5942a062f4184f05745137219 (diff)
downloadlwip-f4b44a7b44faf9bcc345153f3ba23cabc68135da.tar.gz
lwip-f4b44a7b44faf9bcc345153f3ba23cabc68135da.tar.xz
lwip-f4b44a7b44faf9bcc345153f3ba23cabc68135da.zip
Merge commit 'syslinux-3.83-pre1'
Conflicts: com32/modules/chain.c Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--NEWS1
-rw-r--r--com32/modules/chain.c3
2 files changed, 2 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index b6c37f1c..3f14e48d 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ Changes in 3.83:
NBP. This may help avoid a bug in Windows RIS.
* PXELINUX: fix localboot after NBP chainloading on certain
BIOSes (including ASUS A8N-E, but possibly others.)
+ * chain.c32: support chainloaded bootloaders on ISOLINUX.
Changes in 3.82:
* isohybrid: fix the -partok logic for loading from a partition.
diff --git a/com32/modules/chain.c b/com32/modules/chain.c
index ceb5470a..bdeb82d5 100644
--- a/com32/modules/chain.c
+++ b/com32/modules/chain.c
@@ -676,8 +676,7 @@ int main(int argc, char *argv[])
} 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;